diff --git a/common/drawpanel_gal.cpp b/common/drawpanel_gal.cpp
index 6df67bb3a0..cb259aba39 100644
--- a/common/drawpanel_gal.cpp
+++ b/common/drawpanel_gal.cpp
@@ -87,9 +87,11 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
 	Connect( wxEVT_MIDDLE_UP,   wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
 	Connect( wxEVT_MIDDLE_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
 	Connect( wxEVT_MOUSEWHEEL,  wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
-	Connect( wxEVT_CHAR_HOOK,   wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ), NULL, this );
+	Connect( wxEVT_CHAR_HOOK,   wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ) );
 	Connect( wxEVT_KEY_UP,      wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
 	Connect( wxEVT_KEY_DOWN,    wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
+    Connect( wxEVT_ENTER_WINDOW, wxEventHandler (EDA_DRAW_PANEL_GAL::onEnter ), NULL, this );
+    this->SetFocus();
 }
 
 
@@ -101,7 +103,7 @@ EDA_DRAW_PANEL_GAL::~EDA_DRAW_PANEL_GAL()
     if( m_viewControls )
         delete m_viewControls;
 
-    if( m_view )
+        if( m_view )
         delete m_view;
 
     if( m_gal )
@@ -210,6 +212,11 @@ void EDA_DRAW_PANEL_GAL::onEvent( wxEvent& aEvent )
 }
 
 
+void EDA_DRAW_PANEL_GAL::onEnter ( wxEvent& aEvent )
+{
+    SetFocus();
+}
+
 void EDA_DRAW_PANEL_GAL::skipEvent( wxEvent& aEvent )
 {
     // This is necessary for CHAR_HOOK event to generate KEY_UP and KEY_DOWN events
diff --git a/include/class_drawpanel_gal.h b/include/class_drawpanel_gal.h
index 542787fd0d..7daee84a6b 100644
--- a/include/class_drawpanel_gal.h
+++ b/include/class_drawpanel_gal.h
@@ -114,8 +114,9 @@ public:
 protected:
     void onPaint( wxPaintEvent& WXUNUSED( aEvent ) );
     void onSize( wxSizeEvent& aEvent );
-	void onEvent( wxEvent& aEvent );
-	void skipEvent( wxEvent& aEvent );
+    void onEvent( wxEvent& aEvent );
+    void onEnter( wxEvent& aEvent );
+    void skipEvent( wxEvent& aEvent );
 
     KiGfx::GAL*              m_gal;              ///< Interface for drawing objects on a 2D-surface
     KiGfx::VIEW*             m_view;             ///< Stores view settings (scale, center, etc.)