diff --git a/desktoppackage/contents/configuration/panelconfiguration/ToolBar.qml b/desktoppackage/contents/configuration/panelconfiguration/ToolBar.qml
--- a/desktoppackage/contents/configuration/panelconfiguration/ToolBar.qml
+++ b/desktoppackage/contents/configuration/panelconfiguration/ToolBar.qml
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Controls 1.1 as QQC
 import QtQuick.Layouts 1.0
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.core 2.0 as PlasmaCore
@@ -32,6 +33,17 @@
     readonly property string addSpacerButtonText: i18nd("plasma_shell_org.kde.plasma.desktop", "Add Spacer")
     readonly property string settingsButtonText: i18nd("plasma_shell_org.kde.plasma.desktop", "More Settings...")
 
+    QQC.Action {
+        shortcut: "Escape"
+        onTriggered: {
+            if (contextMenuLoader.opened) {
+                contextMenuLoader.close()
+            } else {
+                configDialog.close()
+            }
+        }
+    }
+
     GridLayout {
         id: row
         columns: dialogRoot.vertical ? 1 : 2