M src/FbTk/Menu.cc → src/FbTk/Menu.cc

@@ -1058,11 +1058,11 @@ case XK_Return:
         resetTypeAhead();
         if (validIndex(m_active_index) &&
             isItemEnabled(m_active_index)) {
-            if (menuitems[m_active_index]->submenu() != 0)
+            // send fake button click
+            int button = (event.state & ShiftMask) ? 3 : 1;
+            if (menuitems[m_active_index]->submenu() != 0 && button == 1)
                 enterSubmenu();
             else {
-                // send fake button click
-                int button = (event.state & ShiftMask) ? 3 : 1;
                 find(m_active_index)->click(button, event.time, event.state);
                 m_need_update = true;
                 updateMenu();

M src/WorkspaceMenu.cc → src/WorkspaceMenu.cc

@@ -125,7 +125,7 @@ FbTk::MultiButtonMenuItem* mb_menu = new FbTk::MultiButtonMenuItem(5,
                                                                            wkspc->name().c_str(),
                                                                            &wkspc->menu());
         FbTk::RefCount<FbTk::Command<void> > jump_cmd(new JumpToWorkspaceCmd(wkspc->workspaceID()));
-        mb_menu->setCommand(2, jump_cmd);
+        mb_menu->setCommand(3, jump_cmd);
         insert(mb_menu, workspace + IDX_AFTER_ICONS);
     }
     setItemSelected(screen.currentWorkspace()->workspaceID() + IDX_AFTER_ICONS, true);