diff --git a/data/keys b/data/keys
index f2de94af..2652e93d 100644
--- a/data/keys
+++ b/data/keys
@@ -12,8 +12,8 @@ OnToolbar Mouse4 :PrevWorkspace
 OnToolbar Mouse5 :NextWorkspace
 
 # alt + left/right click to move/resize a window
-OnWindow Mod1 Mouse1 :StartMoving
-OnWindow Mod1 Mouse3 :StartResizing NearestCorner
+OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
+OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner}
 
 # middle click a window's titlebar and drag to attach windows
 OnTitlebar Mouse2 :StartTabbing
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 0528119d..2bb80c3d 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -199,16 +199,16 @@ int run_updates(int old_version, FbTk::ResourceManager &rm) {
                                        "session.modKey",
                                        "Session.ModKey");
 
-        new_keyfile += "OnWindow " + *rc_modkey + " Mouse1 :StartMoving\n";
+        new_keyfile += "OnWindow " + *rc_modkey +
+                       " Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}\n";
+        new_keyfile += "OnWindow " + *rc_modkey +
+                       " Mouse3 :MacroCmd {Raise} {Focus} {StartResizing ";
         if (strcasecmp((*rc_mode).c_str(), "Quadrant") == 0) {
-            new_keyfile += "OnWindow " + *rc_modkey +
-                           " Mouse3 :StartResizing NearestCorner\n";
+            new_keyfile += "NearestCorner}\n";
         } else if (strcasecmp((*rc_mode).c_str(), "Center") == 0) {
-            new_keyfile += "OnWindow " + *rc_modkey +
-                           " Mouse3 :StartResizing Center\n";
+            new_keyfile += "Center}\n";
         } else {
-            new_keyfile += "OnWindow " + *rc_modkey +
-                           " Mouse3 :StartResizing BottomRight\n";
+            new_keyfile += "BottomRight}\n";
         }
         new_keyfile += "\n"; // just for good looks
         new_keyfile += whole_keyfile; // don't forget user's old keybindings