--- a/controls/CustomGrid.py	Sun Mar 18 15:37:04 2012 +0100
+++ b/controls/CustomGrid.py	Sun Mar 18 18:11:46 2012 +0100
@@ -52,6 +52,7 @@
         
         if wx.VERSION >= (2, 6, 0):
             self.Bind(wx.grid.EVT_GRID_SELECT_CELL, self.OnSelectCell)
+            self.Bind(wx.grid.EVT_GRID_EDITOR_HIDDEN, self.OnEditorHidden)
         else:
             wx.grid.EVT_GRID_SELECT_CELL(self, self.OnSelectCell)
         self.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
@@ -151,6 +152,10 @@
         wx.CallAfter(self.RefreshButtons)
         event.Skip()
 
+    def OnEditorHidden(self, event):
+        wx.CallAfter(self.SetFocus)
+        event.Skip()
+
     def OnKeyDown(self, event):
         key_handled = False
         keycode = event.GetKeyCode()