diff --git a/src/toolboxwidget.cpp b/src/toolboxwidget.cpp
index 7a36728..514418e 100644
--- a/src/toolboxwidget.cpp
+++ b/src/toolboxwidget.cpp
@@ -50,7 +50,6 @@ ToolboxWidget *ToolboxWidget::sharedInstance()
     return instance;
 }
 
-
 ToolboxWidget::ToolboxWidget(QWidget *parent) : QWidget{parent}
 {
     setupUI();
@@ -402,11 +401,13 @@ void ToolboxWidget::onToolboxClicked(iDescriptorTool tool, bool requiresDevice)
 {
     // final check to make sure device is connected if required
     iDescriptorDevice *device = AppContext::sharedInstance()->getDevice(m_uuid);
-    if (!device && m_requiresDevice[m_toolboxes.indexOf(sender())]) {
-        QMessageBox::warning(this, "Device Disconnected ?",
-                             "Please select a device to use this tool.");
+    if (!device && requiresDevice) {
+        QMessageBox::warning(
+            this, "Device Disconnected ?",
+            "Device just disconnected, please select a device.");
         return;
     }
+
     qDebug() << "idevice exists:" << (device != nullptr) << m_uuid.c_str();
     switch (tool) {
     case iDescriptorTool::Airplayer: {
@@ -646,7 +647,6 @@ void ToolboxWidget::_enterRecoveryMode(iDescriptorDevice *device)
     // }
 }
 
-
 void ToolboxWidget::restartAirPlayWindow()
 {
     if (!m_airplayWindow) {
diff --git a/src/toolboxwidget.h b/src/toolboxwidget.h
index c92c94f..4320564 100644
--- a/src/toolboxwidget.h
+++ b/src/toolboxwidget.h
@@ -68,7 +68,6 @@ private:
     QWidget *m_contentWidget;
     QGridLayout *m_gridLayout;
     QList<QWidget *> m_toolboxes;
-    QList<bool> m_requiresDevice;
     std::string m_uuid;
     DevDiskImagesWidget *m_devDiskImagesWidget = nullptr;
     NetworkDevicesWidget *m_networkDevicesWidget = nullptr;