diff --git a/airspy_source/src/main.cpp b/airspy_source/src/main.cpp
index 3fe02e75..1c530cc0 100644
--- a/airspy_source/src/main.cpp
+++ b/airspy_source/src/main.cpp
@@ -105,15 +105,16 @@ public:
     }
 
     void selectBySerial(uint64_t serial) {
-        selectedSerial = serial;
         airspy_device* dev;
-        int err = airspy_open_sn(&dev, selectedSerial);
+        int err = airspy_open_sn(&dev, serial);
         if (err != 0) {
             char buf[1024];
-            sprintf(buf, "%016" PRIX64, selectedSerial);
+            sprintf(buf, "%016" PRIX64, serial);
             spdlog::error("Could not open Airspy HF+ {0}", buf);
+            selectedSerial = 0;
             return;
         }
+        selectedSerial = serial;
 
         uint32_t sampleRates[256];
         airspy_get_samplerates(dev, sampleRates, 0);
diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp
index 2fa86619..d91e4717 100644
--- a/core/src/gui/main_window.cpp
+++ b/core/src/gui/main_window.cpp
@@ -33,10 +33,6 @@
 #include <options.h>
 #include <gui/colormaps.h>
 
-
-#include <gui/widgets/file_select.h>
-#include <gui/widgets/folder_select.h>
-
 // const int FFTSizes[] = {
 //     65536,
 //     32768,