diff --git a/components/printers/design/ideprinting.pas b/components/printers/design/ideprinting.pas
index 22837c3978..0fc7f0601f 100644
--- a/components/printers/design/ideprinting.pas
+++ b/components/printers/design/ideprinting.pas
@@ -70,7 +70,7 @@ begin
                          nil,nil,CmdFormatSelection, 'menu_file_print');
 
   //source editor popup
-  RegisterIDEMenuCommand(SourceEditorMenuRoot,
+  RegisterIDEMenuCommand(SrcEditMenuSectionPages,
                          'PrintSelection',
                          SDescrPFSelection, 
                          nil,nil,CmdFormatSelection, 'menu_file_print');
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 5292f96a9b..13f7cac63e 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1772,7 +1772,7 @@ resourcestring
   uemCut = 'Cut';
   uemCopy = 'Copy';
   uemPaste = 'Paste';
-  uemCopyFilename = 'Copy filename';
+  uemCopyFilename = 'Copy Filename';
   uemGotoBookmark = '&Goto Bookmark';
   uemSetFreeBookmark = 'Set a free Bookmark';
   uemNextBookmark = 'Goto next Bookmark';
diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index e7c7b1c707..8124c1c6ea 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -928,18 +928,14 @@ begin
                   'Find previous word occurrence', srkmecFindPrevWordOccurrence, nil, nil, nil, 'menu_search_find_previous');
       SrcEditMenuFindInFiles:=RegisterIDEMenuCommand(AParent,
                   'Find in files', srkmecFindInFiles, nil, nil, nil, 'menu_search_files');
-    // register the sub menu Open File
-    SrcEditSubMenuOpenFile:=RegisterIDESubMenu(SrcEditMenuSectionFirstStatic,
-      'Open File ...', lisOpenFile2);
-      AParent:=SrcEditSubMenuOpenFile;
-      SrcEditMenuOpenFileAtCursor:=RegisterIDEMenuCommand(AParent,
-                                     'Open File At Cursor',uemOpenFileAtCursor, nil, nil, nil, 'menu_search_openfile_atcursor');
-      // register the File Specific dynamic section
-      SrcEditMenuSectionFileDynamic:=RegisterIDEMenuSection(AParent,
-                                                        'File dynamic section');
+  SrcEditMenuSectionPages := RegisterIDEMenuSection(SourceEditorMenuRoot,
+                                                      'Pages');
+
+    SrcEditMenuClosePage:=RegisterIDEMenuCommand(SrcEditMenuSectionPages,
+                                                     'Close Page',uemClosePage, nil, nil, nil, 'menu_close');
 
     // register the Move Page sub menu
-    SrcEditSubMenuMovePage:=RegisterIDESubMenu(SrcEditMenuSectionFirstStatic,
+    SrcEditSubMenuMovePage:=RegisterIDESubMenu(SrcEditMenuSectionPages,
                                                'Move Page ...', lisMovePage);
     AParent:=SrcEditSubMenuMovePage;
       SrcEditMenuMoveEditorLeft:=RegisterIDEMenuCommand(AParent,'MoveEditorLeft',
@@ -951,9 +947,31 @@ begin
       SrcEditMenuMoveEditorLast:=RegisterIDEMenuCommand(AParent,'MoveEditorRightmost',
                                                         uemMoveEditorRightmost);
 
-    AParent:=SrcEditMenuSectionFirstStatic;
-    SrcEditMenuClosePage:=RegisterIDEMenuCommand(AParent,
-                                                     'Close Page',uemClosePage, nil, nil, nil, 'menu_close');
+    // register the sub menu Open File
+    SrcEditSubMenuOpenFile:=RegisterIDESubMenu(SrcEditMenuSectionPages,
+      'Open File ...', lisOpenFile2);
+      AParent:=SrcEditSubMenuOpenFile;
+      SrcEditMenuOpenFileAtCursor:=RegisterIDEMenuCommand(AParent,
+                                     'Open File At Cursor',uemOpenFileAtCursor, nil, nil, nil, 'menu_search_openfile_atcursor');
+      // register the File Specific dynamic section
+      SrcEditMenuSectionFileDynamic:=RegisterIDEMenuSection(AParent,
+                                                        'File dynamic section');
+
+    // register the Flags section
+    SrcEditSubMenuFlags:=RegisterIDESubMenu(SrcEditMenuSectionPages,
+                                            'Flags section', lisFileSettings);
+    AParent:=SrcEditSubMenuFlags;
+      SrcEditMenuReadOnly:=RegisterIDEMenuCommand(AParent,'ReadOnly',uemReadOnly);
+      SrcEditMenuReadOnly.ShowAlwaysCheckable:=true;
+      SrcEditMenuShowLineNumbers:=RegisterIDEMenuCommand(AParent,
+                                            'ShowLineNumbers',uemShowLineNumbers);
+      SrcEditMenuShowLineNumbers.ShowAlwaysCheckable:=true;
+      SrcEditMenuShowUnitInfo:=RegisterIDEMenuCommand(AParent,'ShowUnitInfo',
+                                                      uemShowUnitInfo);
+      SrcEditSubMenuHighlighter:=RegisterIDESubMenu(AParent,'Highlighter',
+                                                      uemHighlighter);
+      SrcEditSubMenuEncoding:=RegisterIDESubMenu(AParent,'Encoding',
+                                                      uemEncoding);
 
   // register the Clipboard section
   SrcEditMenuSectionClipboard:=RegisterIDEMenuSection(SourceEditorMenuRoot,
@@ -990,8 +1008,11 @@ begin
       SrcEditMenuSetFreeBookmark:=RegisterIDEMenuCommand(AParent,
                                       'Set a free Bookmark',uemSetFreeBookmark);
 
+  // register the Debug section
+  SrcEditMenuSectionDebug:=RegisterIDEMenuSection(SourceEditorMenuRoot,
+                                                  'Debug section');
     // register the Debug submenu
-    SrcEditSubMenuDebug:=RegisterIDESubMenu(SrcEditMenuSectionMarks,
+    SrcEditSubMenuDebug:=RegisterIDESubMenu(SrcEditMenuSectionDebug,
                                             'Debug',uemDebugWord);
     AParent:=SrcEditSubMenuDebug;
       // register the Debug submenu items
@@ -1035,22 +1056,6 @@ begin
   SrcEditMenuInsertTodo:=RegisterIDEMenuCommand(SourceEditorMenuRoot,
                         'InsertTodo',uemInsertTodo, nil, nil, nil, 'item_todo');
 
-  // register the Flags section
-  SrcEditSubMenuFlags:=RegisterIDESubMenu(SourceEditorMenuRoot,
-                                          'Flags section', lisFileSettings);
-  AParent:=SrcEditSubMenuFlags;
-    SrcEditMenuReadOnly:=RegisterIDEMenuCommand(AParent,'ReadOnly',uemReadOnly);
-    SrcEditMenuReadOnly.ShowAlwaysCheckable:=true;
-    SrcEditMenuShowLineNumbers:=RegisterIDEMenuCommand(AParent,
-                                          'ShowLineNumbers',uemShowLineNumbers);
-    SrcEditMenuShowLineNumbers.ShowAlwaysCheckable:=true;
-    SrcEditMenuShowUnitInfo:=RegisterIDEMenuCommand(AParent,'ShowUnitInfo',
-                                                    uemShowUnitInfo);
-    SrcEditSubMenuHighlighter:=RegisterIDESubMenu(AParent,'Highlighter',
-                                                    uemHighlighter);
-    SrcEditSubMenuEncoding:=RegisterIDESubMenu(AParent,'Encoding',
-                                                    uemEncoding);
-
   SrcEditMenuEditorProperties:=RegisterIDEMenuCommand(SourceEditorMenuRoot,
            'EditorProperties', dlgFROpts, nil, nil, nil, 'menu_environment_options');
   SrcEditMenuDocking:=RegisterIDEMenuCommand(SourceEditorMenuRoot, 'Docking',
diff --git a/ideintf/menuintf.pas b/ideintf/menuintf.pas
index 5a62e1e102..941a0a331f 100644
--- a/ideintf/menuintf.pas
+++ b/ideintf/menuintf.pas
@@ -374,6 +374,7 @@ var
     SrcEditMenuSectionFirstDynamic: TIDEMenuSection;
     SrcEditMenuSectionFirstStatic: TIDEMenuSection;
       SrcEditSubMenuFind: TIDEMenuSection;
+    SrcEditMenuSectionPages: TIDEMenuSection;
       SrcEditSubMenuOpenFile: TIDEMenuSection;
         // Source Editor: File Specific dynamic section
         //                The items are cleared automatically after each popup.
@@ -383,7 +384,8 @@ var
     SrcEditMenuSectionMarks: TIDEMenuSection;
       SrcEditSubMenuGotoBookmarks: TIDEMenuSection;
       SrcEditSubMenuToggleBookmarks: TIDEMenuSection;
-    SrcEditSubMenuDebug: TIDEMenuSection;
+    SrcEditMenuSectionDebug: TIDEMenuSection;
+      SrcEditSubMenuDebug: TIDEMenuSection;
     SrcEditSubMenuRefactor: TIDEMenuSection;
     SrcEditSubMenuFlags: TIDEMenuSection;
       SrcEditSubMenuHighlighter: TIDEMenuSection;