diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/blackgui/components/downloadcomponent.cpp
index 5a8f84a1a..b698e8025 100644
--- a/src/blackgui/components/downloadcomponent.cpp
+++ b/src/blackgui/components/downloadcomponent.cpp
@@ -313,17 +313,15 @@ namespace BlackGui
                     **/
                 }
 
-                const bool started = QProcess::startDetached(executable, arguments, dir.absolutePath());
-                if (started)
+                const bool shutdown = ui->cb_Shutdown->isChecked();
+                const bool started  = QProcess::startDetached(executable, arguments, dir.absolutePath());
+                if (started && shutdown && sGui)
                 {
-                    const bool shutdown = ui->cb_Shutdown->isChecked();
-                    if (sGui && shutdown)
+                    QTimer::singleShot(250, sGui, []
                     {
-                        QTimer::singleShot(1000, sGui, []
-                        {
-                            CGuiApplication::exit();
-                        });
-                    }
+                        if (!sGui) { return; }
+                        CGuiApplication::exit();
+                    });
                     break;
                 }
             } // files
diff --git a/src/blackgui/components/updateinfocomponent.cpp b/src/blackgui/components/updateinfocomponent.cpp
index 44efedb63..2b2643a36 100644
--- a/src/blackgui/components/updateinfocomponent.cpp
+++ b/src/blackgui/components/updateinfocomponent.cpp
@@ -174,7 +174,7 @@ namespace BlackGui
             {
                 m_downloadDialog->setMode(CDownloadComponent::SwiftInstaller);
                 m_downloadDialog->setDownloadFile(artifact.asRemoteFile());
-                m_downloadDialog->show();
+                m_downloadDialog->showAndStartDownloading();
             }
         }