diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
index 908a3a44..2395026e 100755
--- a/src/chatdlg.cpp
+++ b/src/chatdlg.cpp
@@ -102,11 +102,3 @@ void CChatDlg::AddChatText ( QString strChatText )
 #endif
         );
 }
-
-void CChatDlg::keyPressEvent(QKeyEvent *e)
-{
-    if (e->key() != Qt::Key_Escape)
-    {
-        QDialog::keyPressEvent(e);
-    }
-}
diff --git a/src/chatdlg.h b/src/chatdlg.h
index eb2b0a07..87014f25 100755
--- a/src/chatdlg.h
+++ b/src/chatdlg.h
@@ -48,7 +48,8 @@ public slots:
     void OnLocalInputTextTextChanged ( const QString& strNewText );
     void OnClearPressed();
 
-    void keyPressEvent(QKeyEvent *e);
+    void keyPressEvent ( QKeyEvent *e ) // block escape key
+        { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); }
 
 signals:
     void NewLocalInputText ( QString strNewText );
diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
index 47144d81..b5348005 100755
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@@ -1205,11 +1205,3 @@ void CClientDlg::accept()
 {
     close();
 }
-
-void CClientDlg::keyPressEvent(QKeyEvent *e)
-{
-    if (e->key() != Qt::Key_Escape)
-    {
-        QDialog::keyPressEvent(e);
-    }
-}
diff --git a/src/clientdlg.h b/src/clientdlg.h
index 28a7b9e7..1f58a81e 100755
--- a/src/clientdlg.h
+++ b/src/clientdlg.h
@@ -79,8 +79,8 @@ public:
                  const QString&  strConnOnStartupAddress,
                  const bool      bNewShowComplRegConnList,
                  const bool      bShowAnalyzerConsole,
-                 QWidget*        parent = 0,
-                 Qt::WindowFlags f = 0 );
+                 QWidget*        parent = nullptr,
+                 Qt::WindowFlags f = nullptr );
 
 protected:
     void               SetGUIDesign ( const EGUIDesign eNewDesign );
@@ -207,5 +207,7 @@ public slots:
     void OnNewClientLevelChanged() { MainMixerBoard->iNewClientFaderLevel = pClient->iNewClientFaderLevel; }
 
     void accept();
-    void keyPressEvent(QKeyEvent *e);
+
+    void keyPressEvent ( QKeyEvent *e ) // block escape key
+        { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); }
 };
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 495fd2d3..9bee3988 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -588,11 +588,3 @@ void CServerDlg::changeEvent ( QEvent* pEvent )
         }
     }
 }
-
-void CServerDlg::keyPressEvent(QKeyEvent *e)
-{
-    if (e->key() != Qt::Key_Escape)
-    {
-        QDialog::keyPressEvent(e);
-    }
-}
diff --git a/src/serverdlg.h b/src/serverdlg.h
index 5b621794..1c8fdc01 100755
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@@ -98,5 +98,6 @@ public slots:
     void OnSysTrayMenuExit() { close(); }
     void OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason );
 
-    void keyPressEvent(QKeyEvent *e);
+    void keyPressEvent ( QKeyEvent *e ) // block escape key
+        { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); }
 };