diff --git a/src/qml/Base/HBoxPopup.qml b/src/qml/Base/HBoxPopup.qml
index a3ede936..381d4660 100644
--- a/src/qml/Base/HBoxPopup.qml
+++ b/src/qml/Base/HBoxPopup.qml
@@ -20,7 +20,7 @@ HPopup {
 
     box.clickButtonOnEnter: "ok"
     box.buttonModel: [
-        { name: "ok", text: okText, iconName: "ok" , enabled: okEnabled},
+        { name: "ok", text: okText, iconName: "ok", enabled: okEnabled},
         { name: "cancel", text: qsTr("Cancel"), iconName: "cancel" },
     ]
     box.buttonCallbacks: ({
diff --git a/src/qml/Chat/ClearMessagesPopup.qml b/src/qml/Chat/ClearMessagesPopup.qml
index 02f12e0e..f22e0d41 100644
--- a/src/qml/Chat/ClearMessagesPopup.qml
+++ b/src/qml/Chat/ClearMessagesPopup.qml
@@ -7,6 +7,7 @@ HBoxPopup {
         "The messages will only be removed on your side. " +
         "They will be available again after you restart the application."
     )
+    okText: qsTr("Clear")
     box.focusButton: "ok"
 
     onOk: py.callClientCoro(userId, "clear_events", [roomId])
diff --git a/src/qml/Pages/EditAccount/ImportExportKeys.qml b/src/qml/Pages/EditAccount/ImportExportKeys.qml
index a4b9bdf1..a0092544 100644
--- a/src/qml/Pages/EditAccount/ImportExportKeys.qml
+++ b/src/qml/Pages/EditAccount/ImportExportKeys.qml
@@ -63,6 +63,8 @@ HBox {
 
         id: exportPasswordPopup
         details.text: qsTr("Please enter a passphrase to protect this file:")
+        okText: qsTr("Export")
+
         onAcceptedPasswordChanged:
             encryptionUI.exportKeys(file, acceptedPassword, exportButton)
     }
@@ -82,6 +84,8 @@ HBox {
         details.text: qsTr(
             "Please enter the passphrase that was used to protect this file:"
         )
+        okText: qsTr("Import")
+
         onAcceptedPasswordChanged:
             encryptionUI.importKeys(file, acceptedPassword)
     }