diff --git a/pcbnew/dialog_graphic_items_options.cpp b/pcbnew/dialog_graphic_items_options.cpp
index 76c145fa65..8e9c058c31 100644
--- a/pcbnew/dialog_graphic_items_options.cpp
+++ b/pcbnew/dialog_graphic_items_options.cpp
@@ -64,6 +64,8 @@ DIALOG_GRAPHIC_ITEMS_OPTIONS::~DIALOG_GRAPHIC_ITEMS_OPTIONS(  )
 
 void DIALOG_GRAPHIC_ITEMS_OPTIONS::initValues()
 {
+    SetFocus();
+
     /* Drawings width */
     AddUnitSymbol( *m_GraphicSegmWidthTitle );
     PutValueInLocalUnits( *m_OptPcbSegmWidth,
@@ -134,10 +136,10 @@ void DIALOG_GRAPHIC_ITEMS_OPTIONS::OnOkClick( wxCommandEvent& event )
         ReturnValueFromTextCtrl( *m_OptModuleTextVSize, PCB_INTERNAL_UNIT );
     ModuleTextSize.x =
         ReturnValueFromTextCtrl( *m_OptModuleTextHSize, PCB_INTERNAL_UNIT );
-    
+
     g_DrawDefaultLineThickness =
         ReturnValueFromTextCtrl( *m_DefaultPenSizeCtrl, PCB_INTERNAL_UNIT );
-    
+
     if( g_DrawDefaultLineThickness < 0 )
         g_DrawDefaultLineThickness = 0;