diff --git a/src/gui/MessageBox.cpp b/src/gui/MessageBox.cpp
index 5878aff69..582baa5cc 100644
--- a/src/gui/MessageBox.cpp
+++ b/src/gui/MessageBox.cpp
@@ -20,8 +20,8 @@
 
 MessageBox::Button MessageBox::m_nextAnswer(MessageBox::NoButton);
 
-QMap<QAbstractButton*, MessageBox::Button> MessageBox::m_addedButtonLookup =
-    QMap<QAbstractButton*, MessageBox::Button>();
+QHash<QAbstractButton*, MessageBox::Button> MessageBox::m_addedButtonLookup =
+    QHash<QAbstractButton*, MessageBox::Button>();
 
 QMap<MessageBox::Button, std::pair<QString, QMessageBox::ButtonRole>> MessageBox::m_buttonDefs =
     QMap<MessageBox::Button, std::pair<QString, QMessageBox::ButtonRole>>();
diff --git a/src/gui/MessageBox.h b/src/gui/MessageBox.h
index ded415f6a..b8bd10ad8 100644
--- a/src/gui/MessageBox.h
+++ b/src/gui/MessageBox.h
@@ -19,6 +19,7 @@
 #ifndef KEEPASSX_MESSAGEBOX_H
 #define KEEPASSX_MESSAGEBOX_H
 
+#include <QHash>
 #include <QMap>
 #include <QMessageBox>
 #include <QPushButton>
@@ -102,7 +103,7 @@ public:
 
 private:
     static Button m_nextAnswer;
-    static QMap<QAbstractButton*, Button> m_addedButtonLookup;
+    static QHash<QAbstractButton*, Button> m_addedButtonLookup;
     static QMap<Button, std::pair<QString, QMessageBox::ButtonRole>> m_buttonDefs;
 
     static Button messageBox(QWidget* parent,