diff --git a/src/coreencryption.cpp b/src/coreencryption.cpp
index 5760a8ba6..c3d5dc883 100644
--- a/src/coreencryption.cpp
+++ b/src/coreencryption.cpp
@@ -196,6 +196,14 @@ void Core::checkEncryptedHistory()
     else
         dialogtxt = a;
 
+    if (pwsaltedkeys[ptMain])
+    {
+        useOtherPassword(ptHistory);
+        if (HistoryKeeper::checkPassword())
+            return;
+        clearPassword(ptHistory);
+    }
+
     bool error = true;
     do
     {