diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp
index bbcbc7d5f..93601e3f9 100644
--- a/src/gui/ChangeMasterKeyWidget.cpp
+++ b/src/gui/ChangeMasterKeyWidget.cpp
@@ -24,7 +24,7 @@
 #include "keys/PasswordKey.h"
 
 ChangeMasterKeyWidget::ChangeMasterKeyWidget(QWidget* parent)
-    : QWidget(parent)
+    : DialogyWidget(parent)
     , m_ui(new Ui::ChangeMasterKeyWidget())
 {
     m_ui->setupUi(this);
diff --git a/src/gui/ChangeMasterKeyWidget.h b/src/gui/ChangeMasterKeyWidget.h
index 1b8fcc413..9382e4171 100644
--- a/src/gui/ChangeMasterKeyWidget.h
+++ b/src/gui/ChangeMasterKeyWidget.h
@@ -19,8 +19,8 @@
 #define KEEPASSX_CHANGEMASTERKEYWIDGET_H
 
 #include <QtCore/QScopedPointer>
-#include <QtGui/QWidget>
 
+#include "gui/DialogyWidget.h"
 #include "keys/CompositeKey.h"
 
 class QLabel;
@@ -28,7 +28,7 @@ namespace Ui {
     class ChangeMasterKeyWidget;
 }
 
-class ChangeMasterKeyWidget : public QWidget
+class ChangeMasterKeyWidget : public DialogyWidget
 {
     Q_OBJECT
 
diff --git a/src/gui/DatabaseSettingsWidget.cpp b/src/gui/DatabaseSettingsWidget.cpp
index 591701f0b..fe87e959c 100644
--- a/src/gui/DatabaseSettingsWidget.cpp
+++ b/src/gui/DatabaseSettingsWidget.cpp
@@ -20,7 +20,7 @@
 
 
 DatabaseSettingsWidget::DatabaseSettingsWidget(QWidget* parent)
-    : QWidget(parent)
+    : DialogyWidget(parent)
     , m_ui(new Ui::DatabaseSettingsWidget())
 {
     m_ui->setupUi(this);
diff --git a/src/gui/DatabaseSettingsWidget.h b/src/gui/DatabaseSettingsWidget.h
index 28d2dde72..5f5bfa9f2 100644
--- a/src/gui/DatabaseSettingsWidget.h
+++ b/src/gui/DatabaseSettingsWidget.h
@@ -19,7 +19,8 @@
 #define KEEPASSX_DATABASESETTINGSWIDGET_H
 
 #include <QtCore/QScopedPointer>
-#include <QtGui/QWidget>
+
+#include "gui/DialogyWidget.h"
 
 class QAbstractButton;
 
@@ -27,7 +28,7 @@ namespace Ui {
     class DatabaseSettingsWidget;
 }
 
-class DatabaseSettingsWidget : public QWidget
+class DatabaseSettingsWidget : public DialogyWidget
 {
     Q_OBJECT
 
diff --git a/src/gui/EditEntryWidget.cpp b/src/gui/EditEntryWidget.cpp
index d90158268..32f415a2c 100644
--- a/src/gui/EditEntryWidget.cpp
+++ b/src/gui/EditEntryWidget.cpp
@@ -31,7 +31,7 @@
 #include "gui/EntryAttributesModel.h"
 
 EditEntryWidget::EditEntryWidget(QWidget* parent)
-    : QWidget(parent)
+    : DialogyWidget(parent)
     , m_entry(0)
     , m_ui(new Ui::EditEntryWidget())
     , m_mainUi(new Ui::EditEntryWidgetMain())
diff --git a/src/gui/EditEntryWidget.h b/src/gui/EditEntryWidget.h
index 8b193ac22..e0bc6b674 100644
--- a/src/gui/EditEntryWidget.h
+++ b/src/gui/EditEntryWidget.h
@@ -19,7 +19,8 @@
 #define KEEPASSX_EDITENTRYWIDGET_H
 
 #include <QtCore/QScopedPointer>
-#include <QtGui/QWidget>
+
+#include "gui/DialogyWidget.h"
 
 class Entry;
 class EntryAttachments;
@@ -36,7 +37,7 @@ namespace Ui {
     class EditEntryWidgetNotes;
 }
 
-class EditEntryWidget : public QWidget
+class EditEntryWidget : public DialogyWidget
 {
     Q_OBJECT
 
diff --git a/src/gui/EditGroupWidget.cpp b/src/gui/EditGroupWidget.cpp
index 27a110c42..557a4b90b 100644
--- a/src/gui/EditGroupWidget.cpp
+++ b/src/gui/EditGroupWidget.cpp
@@ -19,7 +19,7 @@
 #include "ui_EditGroupWidget.h"
 
 EditGroupWidget::EditGroupWidget(QWidget* parent)
-    : QWidget(parent)
+    : DialogyWidget(parent)
     , m_ui(new Ui::EditGroupWidget())
     , m_group(0)
 {
diff --git a/src/gui/EditGroupWidget.h b/src/gui/EditGroupWidget.h
index cbf79eba8..5ec6f4451 100644
--- a/src/gui/EditGroupWidget.h
+++ b/src/gui/EditGroupWidget.h
@@ -19,7 +19,8 @@
 #define KEEPASSX_EDITGROUPWIDGET_H
 
 #include <QtCore/QScopedPointer>
-#include <QtGui/QWidget>
+
+#include "gui/DialogyWidget.h"
 
 #include "core/Group.h"
 
@@ -27,7 +28,7 @@ namespace Ui {
     class EditGroupWidget;
 }
 
-class EditGroupWidget : public QWidget
+class EditGroupWidget : public DialogyWidget
 {
     Q_OBJECT