diff --git a/data/keys b/data/keys
index 3bfca002..7e2557c3 100644
--- a/data/keys
+++ b/data/keys
@@ -29,7 +29,7 @@ OnTitlebar Control Mouse1 :StartTabbing
 OnTitlebar Double Mouse1 :Shade
 
 # left click on the titlebar to move the window
-OnTitlebar Mouse1 :MacroCmd {ActivateTab} {Raise} {Focus}
+OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab}
 OnTitlebar Move1  :StartMoving
 
 # middle click on the titlebar to lower
diff --git a/src/Keys.cc b/src/Keys.cc
index 7cd77eb9..d3d0ea22 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -354,8 +354,8 @@ void Keys::loadDefaults() {
     addBinding("OnDesktop Mouse2 :WorkspaceMenu");
     addBinding("OnDesktop Mouse3 :RootMenu");
     addBinding("OnTitlebar Mouse3 :WindowMenu");
-    addBinding("OnWindow Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}");
-    addBinding("OnTitlebar Mouse1 :MacroCmd {ActivateTab} {Raise} {Focus}");
+    addBinding("OnWindow Mouse1 :MacroCmd {Focus} {Raise} {StartMoving}");
+    addBinding("OnTitlebar Mouse1 :MacroCmd {Focus} {Raise} {ActivateTab}");
     addBinding("OnTitlebar Move1 :StartMoving");
     addBinding("OnLeftGrip Move1 :StartResizing bottomleft");
     addBinding("OnRightGrip Move1 :StartResizing bottomright");
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 129833c8..fd18cfd6 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -403,7 +403,7 @@ int run_updates(int old_version, FbTk::ResourceManager &rm) {
         string new_keyfile = "";
 
         new_keyfile += "!mouse actions added by fluxbox-update_configs\n";
-        new_keyfile += "OnTitlebar Mouse1 :MacroCmd {ActivateTab} {Raise} {Focus}\n";
+        new_keyfile += "OnTitlebar Mouse1 :MacroCmd {Focus} {Raise} {ActivateTab}\n";
         new_keyfile += whole_file;
 
         new_keyfile += "\n"; // just for good looks