diff --git a/ChangeLog b/ChangeLog
index 108f15a9..25c46188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2020-03-07  Markus Gans  <guru.mail@muenster.de>
 	* Fixes keyboard input buffer problem when opening a modal dialog
+	* Exit the move-resize-mode when the close confirmation dialog 
+	  is displayed
 
 2020-03-05  Markus Gans  <guru.mail@muenster.de>
 	* Unbuffered reading of keystrokes for better latency
diff --git a/src/fapplication.cpp b/src/fapplication.cpp
index 6c0cbcb3..41beb190 100644
--- a/src/fapplication.cpp
+++ b/src/fapplication.cpp
@@ -355,6 +355,7 @@ void FApplication::showParameterUsage()
 //----------------------------------------------------------------------
 void FApplication::closeConfirmationDialog (FWidget* w, FCloseEvent* ev)
 {
+  app_object->unsetMoveSizeMode();
   const int ret = FMessageBox::info ( w, "Quit"
                                     , "Do you really want\n"
                                       "to quit the program ?"
diff --git a/src/fdialog.cpp b/src/fdialog.cpp
index 93e09d51..ed32ebab 100644
--- a/src/fdialog.cpp
+++ b/src/fdialog.cpp
@@ -1353,63 +1353,56 @@ inline void FDialog::moveSizeKey (FKeyEvent* ev)
   {
     case fc::Fkey_up:
       moveUp(1);
-      ev->accept();
       break;
 
     case fc::Fkey_down:
       moveDown(1);
-      ev->accept();
       break;
 
     case fc::Fkey_left:
       moveLeft(1);
-      ev->accept();
       break;
 
     case fc::Fkey_right:
       moveRight(1);
-      ev->accept();
       break;
 
     case fc::Fmkey_up:
     case fc::Fkey_sr:
-      if ( reduceHeight(1) )
-        ev->accept();
+      reduceHeight(1);
       break;
 
     case fc::Fmkey_down:
     case fc::Fkey_sf:
-      if ( expandHeight(1) )
-        ev->accept();
+      expandHeight(1);
       break;
 
     case fc::Fmkey_left:
     case fc::Fkey_sleft:
-      if ( reduceWidth(1) )
-        ev->accept();
+      reduceWidth(1);
       break;
 
     case fc::Fmkey_right:
     case fc::Fkey_sright:
-      if ( expandWidth(1) )
-        ev->accept();
+      expandWidth(1);
       break;
 
     case fc::Fkey_return:
     case fc::Fkey_enter:
       acceptMoveSize();
-      ev->accept();
       break;
 
     case fc::Fkey_escape:
     case fc::Fkey_escape_mintty:
       cancelMoveSize();
-      ev->accept();
       return;
 
     default:
       break;
   }
+
+  // Accept for all, so that parent widgets will not receive keystrokes
+  ev->accept();
 }
 
 //----------------------------------------------------------------------