diff --git a/src/playlist/queuemanager.cpp b/src/playlist/queuemanager.cpp
index cab73ee12..c83e69f91 100644
--- a/src/playlist/queuemanager.cpp
+++ b/src/playlist/queuemanager.cpp
@@ -45,7 +45,7 @@ QueueManager::QueueManager(QWidget *parent)
   connect(ui_->move_up, SIGNAL(clicked()), SLOT(MoveUp()));
   connect(ui_->clear, SIGNAL(clicked()), SLOT(Clear()));
 
-  QShortcut* close = new QShortcut(QKeySequence("Ctrl+w"), this);
+  QShortcut* close = new QShortcut(QKeySequence::Close, this);
   connect(close, SIGNAL(activated()), SLOT(close()));
 }
 
diff --git a/src/ui/albumcovermanager.cpp b/src/ui/albumcovermanager.cpp
index cd71afcb3..54abf6ffa 100644
--- a/src/ui/albumcovermanager.cpp
+++ b/src/ui/albumcovermanager.cpp
@@ -95,7 +95,7 @@ AlbumCoverManager::AlbumCoverManager(LibraryBackend* backend, QWidget* parent,
   ui_->albums->setAttribute(Qt::WA_MacShowFocusRect, false);
   ui_->artists->setAttribute(Qt::WA_MacShowFocusRect, false);
 
-  QShortcut* close = new QShortcut(QKeySequence("Ctrl+w"), this);
+  QShortcut* close = new QShortcut(QKeySequence::Close, this);
   connect(close, SIGNAL(activated()), SLOT(close()));
 }
 
diff --git a/src/ui/equalizer.cpp b/src/ui/equalizer.cpp
index 0c276b4ee..c63c5f29a 100644
--- a/src/ui/equalizer.cpp
+++ b/src/ui/equalizer.cpp
@@ -20,10 +20,11 @@
 #include "widgets/equalizerslider.h"
 #include "ui/iconloader.h"
 
-#include <QSettings>
-#include <QtDebug>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <QSettings>
+#include <QShortcut>
+#include <QtDebug>
 
 // We probably don't need to translate these, right?
 const char* Equalizer::kGainText[] = {
@@ -61,6 +62,9 @@ Equalizer::Equalizer(QWidget *parent)
   connect(ui_->preset, SIGNAL(currentIndexChanged(QString)), SLOT(PresetChanged(QString)));
   connect(ui_->preset_save, SIGNAL(clicked()), SLOT(SavePreset()));
   connect(ui_->preset_del, SIGNAL(clicked()), SLOT(DelPreset()));
+
+  QShortcut* close = new QShortcut(QKeySequence::Close, this);
+  connect(close, SIGNAL(activated()), SLOT(close()));
 }
 
 Equalizer::~Equalizer() {
diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index ad9765839..fc2e515ef 100644
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -211,6 +211,8 @@ SettingsDialog::SettingsDialog(BackgroundStreams* streams, QWidget* parent)
   ui_->b_show_tray_icon_->setEnabled(false);
   ui_->startup_group_->setEnabled(false);
 #endif
+
+  ui_->buttonBox->button(QDialogButtonBox::Cancel)->setShortcut(QKeySequence::Close);
 }
 
 SettingsDialog::~SettingsDialog() {
diff --git a/src/visualisations/visualisationcontainer.cpp b/src/visualisations/visualisationcontainer.cpp
index 4ea7b4b21..f57db5deb 100644
--- a/src/visualisations/visualisationcontainer.cpp
+++ b/src/visualisations/visualisationcontainer.cpp
@@ -24,15 +24,15 @@
 #include "ui/iconloader.h"
 #include "ui/screensaver.h"
 
-#include <QHBoxLayout>
-#include <QSettings>
 #include <QGLWidget>
-#include <QtDebug>
 #include <QGraphicsProxyWidget>
-#include <QMenu>
-#include <QSignalMapper>
-
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QMenu>
+#include <QSettings>
+#include <QShortcut>
+#include <QSignalMapper>
+#include <QtDebug>
 
 const char* VisualisationContainer::kSettingsGroup = "Visualisations";
 const int VisualisationContainer::kDefaultWidth = 828;
@@ -59,6 +59,9 @@ VisualisationContainer::VisualisationContainer(QWidget *parent)
   }
   fps_ = s.value("fps", kDefaultFps).toInt();
   size_ = s.value("size", kDefaultTextureSize).toInt();
+
+  QShortcut* close = new QShortcut(QKeySequence::Close, this);
+  connect(close, SIGNAL(activated()), SLOT(close()));
 }
 
 void VisualisationContainer::Init() {