diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp
index 59c6f51a27e..b6ddda19c87 100644
--- a/src/qt/createwalletdialog.cpp
+++ b/src/qt/createwalletdialog.cpp
@@ -77,7 +77,7 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
     connect(ui->blank_wallet_checkbox, &QCheckBox::toggled, [this](bool checked) {
         // Disable the disable_privkeys_checkbox when blank_wallet_checkbox is checked
         // as blank-ness only pertains to wallets with private keys.
-        ui->disable_privkeys_checkbox->setEnabled(!checked);
+        ui->disable_privkeys_checkbox->setEnabled(!checked && !ui->encrypt_wallet_checkbox->isChecked());
         if (checked) {
             ui->disable_privkeys_checkbox->setChecked(false);
         }
diff --git a/src/qt/forms/createwalletdialog.ui b/src/qt/forms/createwalletdialog.ui
index c4faff94075..a32a55f82be 100644
--- a/src/qt/forms/createwalletdialog.ui
+++ b/src/qt/forms/createwalletdialog.ui
@@ -86,7 +86,7 @@
    <item>
     <widget class="QCheckBox" name="encrypt_wallet_checkbox">
      <property name="toolTip">
-      <string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
+      <string>Encrypt the wallet's private key with a passphrase of your choice. Other wallet data such as transaction history will not be encrypted.</string>
      </property>
      <property name="text">
       <string>Encrypt Wallet</string>