diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 0f06bbaaa6a..85d79ee26c3 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -309,14 +309,20 @@ void BitcoinApplication::requestShutdown()
     qDebug() << __func__ << ": Requesting shutdown";
     startThread();
     window->hide();
+    // Must disconnect node signals otherwise current thread can deadlock since
+    // no event loop is running.
+    window->unsubscribeFromCoreSignals();
+    // Request node shutdown, which can interrupt long operations, like
+    // rescanning a wallet.
+    m_node.startShutdown();
+    // Unsetting the client model can cause the current thread to wait for node
+    // to complete an operation, like wait for a RPC execution to complate.
     window->setClientModel(nullptr);
     pollShutdownTimer->stop();
 
     delete clientModel;
     clientModel = nullptr;
 
-    m_node.startShutdown();
-
     // Request shutdown from core thread
     Q_EMIT requestedShutdown();
 }