diff --git a/common/zoom.cpp b/common/zoom.cpp
index 6d6b93dc96..216a4ad926 100644
--- a/common/zoom.cpp
+++ b/common/zoom.cpp
@@ -257,7 +257,7 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
 
     wxMenu* zoom_choice = new wxMenu;
     AddMenuItem( MasterMenu, zoom_choice,
-                 ID_POPUP_ZOOM_SELECT, _( "Zoom select" ),
+                 ID_POPUP_ZOOM_SELECT, _( "Zoom Select" ),
                  KiBitmap( zoom_selection_xpm ) );
 
     zoom = screen->GetZoom();
@@ -281,7 +281,7 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
     {
         wxMenu* gridMenu = new wxMenu;
         AddMenuItem( MasterMenu, gridMenu, ID_POPUP_GRID_SELECT,
-                     _( "Grid select" ), KiBitmap( grid_select_xpm ) );
+                     _( "Grid Select" ), KiBitmap( grid_select_xpm ) );
 
         wxArrayString gridsList;
         int icurr = screen->BuildGridsChoiceList( gridsList, g_UserUnit != INCHES );
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 97bf1d69dc..e6d3c46a3d 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -237,8 +237,8 @@ public:
         Add( PNS::TOOL_BASE::ACT_RouterOptions );
 
         AppendSeparator();
-        Add( &m_zoomMenu, _( "Zoom select" ), false );
-        Add( &m_gridMenu, _( "Grid select" ), false );
+        Add( &m_zoomMenu, _( "Zoom Select" ), false );
+        Add( &m_gridMenu, _( "Grid Select" ), false );
     }
 
 private:
diff --git a/pcbnew/tools/tool_menu.cpp b/pcbnew/tools/tool_menu.cpp
index 9af7fff719..54cc8734d1 100644
--- a/pcbnew/tools/tool_menu.cpp
+++ b/pcbnew/tools/tool_menu.cpp
@@ -96,9 +96,10 @@ void TOOL_MENU::AddStandardSubMenus( EDA_DRAW_FRAME& aFrame )
     m_menu.AddItem( COMMON_ACTIONS::zoomOut, S_C::ShowAlways, 1000 );
     m_menu.AddItem( COMMON_ACTIONS::zoomFitScreen, S_C::ShowAlways, 1000 );
 
+    m_menu.AddSeparator(SELECTION_CONDITIONS::ShowAlways, 1000);
     m_menu.AddMenu( createOwnSubMenu<ZOOM_MENU>( &aFrame ).get(),
-            _( "Zoom" ), false, S_C::ShowAlways, 1000 );
+            _( "Zoom Select" ), false, S_C::ShowAlways, 1000 );
 
     m_menu.AddMenu( createOwnSubMenu<GRID_MENU>( &aFrame ).get(),
-            _( "Grid" ), false, S_C::ShowAlways, 1000 );
+            _( "Grid Select" ), false, S_C::ShowAlways, 1000 );
 }