diff --git a/defaults/defaults b/defaults/defaults
index 33f4b0acd76da4ffdd2e8fe4788ddb8d55a490d5..7e3a54ed22a11b0b71986b932bdb9e1879b1262a 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -2,7 +2,7 @@ activate_action=bring
 borderless_maximize=true
 box_move=false
 box_resize=false
-button_layout=OT|SHMC
+button_layout=O|HMC
 button_offset=0
 button_spacing=0
 click_to_focus=true
diff --git a/mcs-plugin/xfwm4_plugin.h b/mcs-plugin/xfwm4_plugin.h
index 0c185c73b7f6a50ae87c8b1b5cfc0441147d8c00..b403421d463dedff48d485d38be7a04965abc911 100644
--- a/mcs-plugin/xfwm4_plugin.h
+++ b/mcs-plugin/xfwm4_plugin.h
@@ -35,7 +35,7 @@
 
 #define DEFAULT_THEME "Default"
 #define DEFAULT_KEY_THEME "Default"
-#define DEFAULT_LAYOUT "OT|SHMC"
+#define DEFAULT_LAYOUT "O|HMC"
 #define DEFAULT_ACTION "maximize"
 #define DEFAULT_ALIGN "center"
 #define DEFAULT_FONT "Sans Bold 9"