diff --git a/src/qml/Chat/Timeline/EventDelegate.qml b/src/qml/Chat/Timeline/EventDelegate.qml
index 7ba9d850..0ffa9e55 100644
--- a/src/qml/Chat/Timeline/EventDelegate.qml
+++ b/src/qml/Chat/Timeline/EventDelegate.qml
@@ -128,7 +128,7 @@ Column {
             icon.name: "clear-messages"
             text: qsTr("Clear messages")
             onTriggered: Utils.makePopup(
-                "Chat/ClearMessagesPopup.qml",
+                "Popups/ClearMessagesPopup.qml",
                 chatPage,
                 {userId: chatPage.userId, roomId: chatPage.roomId},
             )
diff --git a/src/qml/Pages/EditAccount/ImportExportKeys.qml b/src/qml/Pages/EditAccount/ImportExportKeys.qml
index a0092544..00fc6004 100644
--- a/src/qml/Pages/EditAccount/ImportExportKeys.qml
+++ b/src/qml/Pages/EditAccount/ImportExportKeys.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import Qt.labs.platform 1.1
 import "../../Base"
+import "../../Popups"
 import "../../utils.js" as Utils
 
 HBox {
@@ -58,7 +59,7 @@ HBox {
         }
     }
 
-    HPasswordPopup {
+    PasswordPopup {
         property url file: ""
 
         id: exportPasswordPopup
@@ -69,7 +70,7 @@ HBox {
             encryptionUI.exportKeys(file, acceptedPassword, exportButton)
     }
 
-    HPasswordPopup {
+    PasswordPopup {
         property url file: ""
 
         function verifyPassword(pass, callback) {
diff --git a/src/qml/Base/HBoxPopup.qml b/src/qml/Popups/BoxPopup.qml
similarity index 98%
rename from src/qml/Base/HBoxPopup.qml
rename to src/qml/Popups/BoxPopup.qml
index 381d4660..208c3143 100644
--- a/src/qml/Base/HBoxPopup.qml
+++ b/src/qml/Popups/BoxPopup.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
+import "../Base"
 
 HPopup {
     id: popup
diff --git a/src/qml/Chat/ClearMessagesPopup.qml b/src/qml/Popups/ClearMessagesPopup.qml
similarity index 93%
rename from src/qml/Chat/ClearMessagesPopup.qml
rename to src/qml/Popups/ClearMessagesPopup.qml
index f22e0d41..a20883e6 100644
--- a/src/qml/Chat/ClearMessagesPopup.qml
+++ b/src/qml/Popups/ClearMessagesPopup.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.12
-import "../Base"
 
-HBoxPopup {
+BoxPopup {
     summary.text: qsTr("Clear this room's messages?")
     details.text: qsTr(
         "The messages will only be removed on your side. " +
diff --git a/src/qml/Base/HPasswordPopup.qml b/src/qml/Popups/PasswordPopup.qml
similarity index 97%
rename from src/qml/Base/HPasswordPopup.qml
rename to src/qml/Popups/PasswordPopup.qml
index 962b4f5d..108a67b9 100644
--- a/src/qml/Base/HPasswordPopup.qml
+++ b/src/qml/Popups/PasswordPopup.qml
@@ -1,9 +1,8 @@
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import "../SidePane"
+import "../Base"
 
-HBoxPopup {
+BoxPopup {
     id: popup
     okEnabled: Boolean(passwordField.text)
 
diff --git a/src/qml/Shortcuts.qml b/src/qml/Shortcuts.qml
index 97ec2946..e688ee48 100644
--- a/src/qml/Shortcuts.qml
+++ b/src/qml/Shortcuts.qml
@@ -117,7 +117,7 @@ HShortcutHandler {
         enabled: window.uiState.page == "Chat/Chat.qml"
         sequences: settings.keys.clearRoomMessages
         onPressed: Utils.makePopup(
-            "Chat/ClearMessagesPopup.qml",
+            "Popups/ClearMessagesPopup.qml",
             mainUI,
             {
                 userId: window.uiState.pageProperties.userId,