diff --git a/modules/gamelib/ui/uiminimap.lua b/modules/gamelib/ui/uiminimap.lua
index 88686d56..5c945d61 100644
--- a/modules/gamelib/ui/uiminimap.lua
+++ b/modules/gamelib/ui/uiminimap.lua
@@ -273,11 +273,20 @@ function UIMinimap:createFlagWindow(pos)
 
   flagRadioGroup:selectWidget(flagRadioGroup:getFirstWidget())
 
-  okButton.onClick = function() 
+  local successFunc = function() 
     self:addFlag(pos, flagRadioGroup:getSelectedWidget().icon, description:getText())
     self:destroyFlagWindow()
   end
-  cancelButton.onClick = function() self:destroyFlagWindow() end
+  
+  local cancelFunc = function() 
+    self:destroyFlagWindow() 
+  end
+  
+  okButton.onClick = successFunc
+  cancelButton.onClick = cancelFunc
+  
+  self.flagWindow.onEnter = successFunc
+  self.flagWindow.onEscape = cancelFunc
 
   self.flagWindow.onDestroy = function() flagRadioGroup:destroy() end
 end
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 6a9506d4..b648d099 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1356,7 +1356,6 @@ void Game::mount(bool mount)
 {
     if(!canPerformGameAction())
         return;
-
     m_protocolGame->sendMountStatus(mount);
 }
 
@@ -1371,7 +1370,6 @@ void Game::answerModalDialog(int dialog, int button, int choice)
 {
     if(!canPerformGameAction())
         return;
-
     m_protocolGame->sendAnswerModalDialog(dialog, button, choice);
 }