diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1136,7 +1136,9 @@
 
 void BitcoinGUI::detectShutdown() {
     if (ShutdownRequested()) {
-        if (rpcConsole) rpcConsole->hide();
+        if (rpcConsole) {
+            rpcConsole->hide();
+        }
         qApp->quit();
     }
 }
@@ -1149,13 +1151,12 @@
         progressDialog->setCancelButton(0);
         progressDialog->setAutoClose(false);
         progressDialog->setValue(0);
-    } else if (nProgress == 100) {
-        if (progressDialog) {
-            progressDialog->close();
-            progressDialog->deleteLater();
-        }
-    } else if (progressDialog)
+    } else if (nProgress == 100 && progressDialog) {
+        progressDialog->close();
+        progressDialog->deleteLater();
+    } else if (progressDialog) {
         progressDialog->setValue(nProgress);
+    }
 }
 
 void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon) {
@@ -1166,8 +1167,9 @@
 
 void BitcoinGUI::showModalOverlay() {
     if (modalOverlay &&
-        (progressBar->isVisible() || modalOverlay->isLayerVisible()))
+        (progressBar->isVisible() || modalOverlay->isLayerVisible())) {
         modalOverlay->toggleVisibility();
+    }
 }
 
 static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string &message,