diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
index 2ae6a6dfb6..690b06ad9b 100644
--- a/UI/RemoteISOScreen.cpp
+++ b/UI/RemoteISOScreen.cpp
@@ -211,8 +211,8 @@ static bool FindServer(std::string &resultHost, int &resultPort) {
 		}
 	}
 
-	//don't scan if in manual mode
-	if (g_Config.bRemoteISOManual) {
+	// Don't scan if in manual mode.
+	if (g_Config.bRemoteISOManual || scanCancelled) {
 		return false;
 	}