diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 375e208..cc56aae 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -154,7 +154,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     m_ZTabWidget->addTab(m_mainStackedWidget, "iDevice");
     auto *appsWidgetTab =
         m_ZTabWidget->addTab(AppsWidget::sharedInstance(), "Apps");
-    m_ZTabWidget->addTab(new ToolboxWidget(this), "Toolbox");
+    m_ZTabWidget->addTab(ToolboxWidget::sharedInstance(), "Toolbox");
     auto *jailbrokenWidget = new JailbrokenWidget(this);
     m_ZTabWidget->addTab(jailbrokenWidget, "Jailbroken");
     m_ZTabWidget->finalizeStyles();
diff --git a/src/toolboxwidget.cpp b/src/toolboxwidget.cpp
index 698e94a..b749f61 100644
--- a/src/toolboxwidget.cpp
+++ b/src/toolboxwidget.cpp
@@ -633,6 +633,7 @@ void ToolboxWidget::restartAirPlayWidget()
     connect(
         m_airplayWidget, &QObject::destroyed, this,
         [this]() {
+            m_airplayWidget = nullptr;
             // give some time for cleanup
             QTimer::singleShot(100, this, [this]() {
                 onToolboxClicked(iDescriptorTool::Airplayer, false);