diff --git a/NetworkClient.cpp b/NetworkClient.cpp
index a968244c..1d4a7d6c 100644
--- a/NetworkClient.cpp
+++ b/NetworkClient.cpp
@@ -157,15 +157,15 @@ void NetworkClient::StartClient()
 
 void NetworkClient::StopClient()
 {
-    server_connected = false;
-    client_active    = false;
-
-    if (server_connected)
+    if(server_connected)
     {
         shutdown(client_sock, SD_RECEIVE);
         closesocket(client_sock);
     }
 
+    client_active    = false;
+    server_connected = false;
+
     if(ListenThread)
     {
         ListenThread->join();
diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp
index 46ad0553..2abbd85e 100644
--- a/qt/OpenRGBDialog2.cpp
+++ b/qt/OpenRGBDialog2.cpp
@@ -1269,14 +1269,15 @@ void OpenRGBDialog2::UpdateDevicesList()
     | Remove all remaining device tabs                      |
     \*-----------------------------------------------------*/
     unsigned int tab_count = ui->DevicesTabBar->count();
+    unsigned int base_tab = controllers.size();
 
     for(unsigned int tab_idx = controllers.size(); tab_idx < tab_count; tab_idx++)
     {
-        QWidget* tab_widget = ui->DevicesTabBar->widget(tab_idx);
+        QWidget* tab_widget = ui->DevicesTabBar->widget(base_tab);
 
         if(dynamic_cast<OpenRGBPluginContainer*>(tab_widget) == nullptr)
         {
-            ui->DevicesTabBar->removeTab(tab_idx);
+            ui->DevicesTabBar->removeTab(base_tab);
             delete tab_widget;
         }
     }
@@ -1293,17 +1294,18 @@ void OpenRGBDialog2::UpdateDevicesList()
         \*-----------------------------------------------------*/
         for(int tab_idx = controllers.size(); tab_idx < ui->InformationTabBar->count(); tab_idx++)
         {
-            std::string type_str = ui->InformationTabBar->widget(tab_idx)->metaObject()->className();
+            std::string type_str = ui->InformationTabBar->widget(base_tab)->metaObject()->className();
             if(type_str == "Ui::OpenRGBDeviceInfoPage")
             {
                 found = true;
-                QWidget* tab_widget = ui->InformationTabBar->widget(tab_idx);
+                QWidget* tab_widget = ui->InformationTabBar->widget(base_tab);
 
-                ui->InformationTabBar->removeTab(tab_idx);
+                ui->InformationTabBar->removeTab(base_tab);
 
                 delete tab_widget;
                 break;
             }
+            base_tab += 1;
         }
     }
 }