diff --git a/ide/main.pp b/ide/main.pp
index 2144dc4092..7b01794b15 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -383,7 +383,6 @@ type
     procedure mnuToolConvertDelphiProjectClicked(Sender: TObject);
     procedure mnuToolConvertDelphiPackageClicked(Sender: TObject);
     procedure mnuToolConvertEncodingClicked(Sender: TObject);
-    procedure mnuToolManageDesktopsClicked(Sender: TObject);
     procedure mnuToolBuildLazarusClicked(Sender: TObject);
     procedure mnuToolBuildAdvancedLazarusClicked(Sender: TObject);
     procedure mnuToolConfigBuildLazClicked(Sender: TObject);
@@ -398,6 +397,7 @@ type
 
     // windows menu
     procedure mnuWindowManagerClicked(Sender: TObject);
+    procedure mnuWindowManageDesktopsClicked(Sender: TObject);
 
     // help menu
     // see helpmanager.pas
@@ -2885,7 +2885,6 @@ begin
     itmEnvCodeToolsDefinesEditor.OnClick := @mnuEnvCodeToolsDefinesEditorClicked;
 
     itmToolConfigure.OnClick := @mnuToolConfigureUserExtToolsClicked;
-    itmToolManageDesktops.OnClick := @mnuToolManageDesktopsClicked;
 
     itmToolDiff.OnClick := @mnuToolDiffClicked;
 
@@ -2909,6 +2908,7 @@ procedure TMainIDE.SetupWindowsMenu;
 begin
   inherited SetupWindowsMenu;
   MainIDEBar.itmWindowManager.OnClick := @mnuWindowManagerClicked;
+  MainIDEBar.itmWindowManageDesktops.OnClick := @mnuWindowManageDesktopsClicked;
 end;
 
 procedure TMainIDE.SetupHelpMenu;
@@ -3158,7 +3158,7 @@ begin
 
     itmToolConfigure.Command:=GetIdeCmdRegToolBtn(ecExtToolSettings);
 
-    itmToolManageDesktops.Command:=GetCommand(ecManageDesktops, nil, TShowDesktopsToolButton);
+    itmWindowManageDesktops.Command:=GetCommand(ecManageDesktops, nil, TShowDesktopsToolButton);
 
     itmToolDiff.Command:=GetIdeCmdRegToolBtn(ecDiff);
 
@@ -4952,7 +4952,7 @@ begin
   ShowConvertEncodingDlg;
 end;
 
-procedure TMainIDE.mnuToolManageDesktopsClicked(Sender: TObject);
+procedure TMainIDE.mnuWindowManageDesktopsClicked(Sender: TObject);
 begin
   ShowDesktopManagerDlg;
 end;
diff --git a/ide/mainbar.pas b/ide/mainbar.pas
index a253c94eb9..b22229485c 100644
--- a/ide/mainbar.pas
+++ b/ide/mainbar.pas
@@ -355,7 +355,6 @@ type
       //itmCustomTools: TIDEMenuSection;
         itmToolConfigure: TIDEMenuCommand;
       //itmSecondaryTools: TIDEMenuSection;
-        itmToolManageDesktops: TIDEMenuCommand;
         itmToolDiff: TIDEMenuCommand;
       //itmDelphiConversion: TIDEMenuSection;
         itmToolCheckLFM: TIDEMenuCommand;
@@ -372,6 +371,7 @@ type
     //mnuWindow: TIDEMenuSection;
       //itmWindowManagers: TIDEMenuSection;
         itmWindowManager: TIDEMenuCommand;
+        itmWindowManageDesktops: TIDEMenuCommand;
 
     // help menu
     //mnuHelp: TIDEMenuSection;
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index c75fb1ccc1..52872e04c1 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -1456,7 +1456,6 @@ begin
 
     CreateMenuSeparatorSection(mnuTools,itmSecondaryTools,'itmSecondaryTools');
     ParentMI:=itmSecondaryTools;
-    CreateMenuItem(ParentMI,itmToolManageDesktops,'itmToolManageDesktops', lisDesktops, 'menu_manage_desktops');
     CreateMenuItem(ParentMI,itmToolDiff,'itmToolDiff',lisMenuCompareFiles, 'menu_tool_diff');
 
     CreateMenuSeparatorSection(mnuTools,itmConversion,'itmConversion');
@@ -1487,6 +1486,7 @@ begin
     CreateMenuSeparatorSection(mnuWindow,itmWindowManagers,'itmWindowManagers');
     ParentMI:=itmWindowManagers;
     CreateMenuItem(ParentMI,itmWindowManager,'itmWindowManager', lisManageSourceEditors, 'menu_manage_source_editors');
+    CreateMenuItem(ParentMI,itmWindowManageDesktops,'itmWindowManageDesktops', lisDesktops, 'menu_manage_desktops');
     // Populated later with a list of editor names
     CreateMenuSeparatorSection(mnuWindow,itmWindowLists,'itmWindowLists');
     CreateMenuSeparatorSection(mnuWindow,itmCenterWindowLists,'itmCenterWindowLists');