diff --git a/gui/wxpython/dbmgr/manager.py b/gui/wxpython/dbmgr/manager.py
index b1cbd93ab71..c3821abb4ef 100644
--- a/gui/wxpython/dbmgr/manager.py
+++ b/gui/wxpython/dbmgr/manager.py
@@ -204,6 +204,8 @@ def OnCloseWindow(self, event):
         if self.parent and self.parent.GetName() == "LayerManager":
             # deregister ATM
             self.parent.dialogs["atm"].remove(self)
+            # set map window focus
+            self.parent.GetMapDisplay().GetMapWindow().SetFocus()
 
         if not isinstance(event, wx.CloseEvent):
             self.Destroy()
diff --git a/gui/wxpython/vdigit/toolbars.py b/gui/wxpython/vdigit/toolbars.py
index a9cafe3dfb4..09833758882 100644
--- a/gui/wxpython/vdigit/toolbars.py
+++ b/gui/wxpython/vdigit/toolbars.py
@@ -1035,6 +1035,8 @@ def OnSelectMap(self, event):
         # select the given map layer for editing
         self.StartEditing(self.layers[selection])
 
+        wx.CallLater(100, self.MapWindow.SetFocus)
+
         event.Skip()
 
     def StartEditing(self, mapLayer):