diff --git a/Software/PC_Application/LibreVNA-GUI/appwindow.cpp b/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
index a2dc6d7..d663e55 100644
--- a/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
@@ -491,9 +491,13 @@ void AppWindow::SetupSCPI()
         QString serial;
         if(params.size() > 0) {
             serial = params[0];
+        } else if(UpdateDeviceList() > 0) {
+            serial = deviceList[0].serial;
+        } else {
+            return SCPI::getResultName(SCPI::Result::Error);
         }
         if(!ConnectToDevice(serial)) {
-            return "Device not found";
+            return SCPI::getResultName(SCPI::Result::Error);
         } else {
             return SCPI::getResultName(SCPI::Result::Empty);
         }