diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index a2dffb4949..065b4df0bd 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -1059,7 +1059,7 @@ void EDA_BASE_FRAME::OnPreferences( wxCommandEvent& event )
     if( GetFrameType() == FRAME_GERBER )
         expand.push_back( book->GetPageCount() );
 
-    book->AddPage( new wxPanel( book ), _( "GerbView" ) );
+    book->AddPage( new wxPanel( book ), _( "Gerber Viewer" ) );
     book->AddSubPage( CREATE_PANEL( PANEL_GBR_DISPLAY_OPTIONS ), _( "Display Options" ) );
     book->AddSubPage( CREATE_PANEL( PANEL_GBR_EXCELLON_OPTIONS ), _( "Excellon Options" ) );
 
diff --git a/common/hotkey_store.cpp b/common/hotkey_store.cpp
index d262be5174..1300742c9f 100644
--- a/common/hotkey_store.cpp
+++ b/common/hotkey_store.cpp
@@ -73,7 +73,8 @@ wxString HOTKEY_STORE::GetSectionName( TOOL_ACTION* aAction )
             { wxT( "eeschema" ), _( "Schematic Editor" ) },
             { wxT( "pcbnew" ),   _( "PCB Editor" ) },
             { wxT( "plEditor" ), _( "Drawing Sheet Editor" ), },
-            { wxT( "3DViewer" ), _( "3D Viewer" ) }
+            { wxT( "3DViewer" ), _( "3D Viewer" ) },
+            { wxT( "gerbview" ), _( "Gerber Viewer" ) }
     };
 
     wxString appName = GetAppName( aAction );