2 files changed, 18 insertions, 11 deletions
diff --git a/data/menu b/data/menu
index 230a3346..0677e73a 100644
--- a/data/menu
+++ b/data/menu
@@ -27,15 +27,10 @@
   </item>
 </menu>
 
-<menu id="client-menu" plugin="client_menu" />
-<menu id="client-list-menu" plugin="client_list_menu" />
-
 <menu id="root-menu" label="Openbox 3">
   <menu id="apps-menu" />
   <menu id="games-menu" />
   <separator />
-  <menu id="client-menu" plugin="client_menu" />
-  <separator />
   <menu id="client-list-menu" plugin="client_list_menu" />
   <separator />
   <item label="Restart">
diff --git a/data/rc3 b/data/rc3
index a3375704..f379d4c2 100644
--- a/data/rc3
+++ b/data/rc3
@@ -132,7 +132,9 @@
       <action name="lower"/>
     </mousebind>
     <mousebind button="A-Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
     <mousebind button="A-Up" action="click">
       <action name="desktopright"/>
@@ -170,7 +172,9 @@
       <action name="unshade"/>
     </mousebind>
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
   </context>
   <context name="handle">
@@ -236,10 +240,14 @@
       <action name="focus"/>
     </mousebind>
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
     <mousebind button="Left" action="click">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
     <mousebind button="Left" action="doubleclick">
       <action name="close"/>
@@ -305,10 +313,14 @@
       <action name="desktopleft"/>
     </mousebind>
     <mousebind button="Middle" action="press">
-      <action name="showmenu"><menu>client-list-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_list_menu">client-list-menu</menu>
+      </action>
     </mousebind> 
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>root-menu</menu></action>
+      <action name="showmenu">
+        <menu>root-menu</menu>
+      </action>
     </mousebind>
   </context>
 </mouse>