diff --git a/src/blackgui/components/autopublishcomponent.cpp b/src/blackgui/components/autopublishcomponent.cpp
index 327e56e11..975e16ba9 100644
--- a/src/blackgui/components/autopublishcomponent.cpp
+++ b/src/blackgui/components/autopublishcomponent.cpp
@@ -55,6 +55,11 @@ namespace BlackGui
             return r;
         }
 
+        bool CAutoPublishComponent::isEmpty() const
+        {
+            return m_data.isEmpty();
+        }
+
         void CAutoPublishComponent::analyzeAgainstDBData()
         {
             if (!sGui || sGui->isShuttingDown()) { return; }
diff --git a/src/blackgui/components/autopublishcomponent.h b/src/blackgui/components/autopublishcomponent.h
index f8632ab15..c3fe2bb71 100644
--- a/src/blackgui/components/autopublishcomponent.h
+++ b/src/blackgui/components/autopublishcomponent.h
@@ -37,6 +37,9 @@ namespace BlackGui
             //! Read the files
             int readFiles();
 
+            //! Data empty
+            bool isEmpty() const;
+
         private:
             QScopedPointer<Ui::CAutoPublishComponent> ui;
             BlackMisc::Simulation::CAutoPublishData m_data;
diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 58b8cf144..6c50e9755 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -217,8 +217,13 @@ void CSwiftData::checkMinimumVersion()
 
 void CSwiftData::checkAutoPublishing()
 {
-    if (!sApp || sApp->isShuttingDown()) { return; }
     if (!CAutoPublishData::existAutoPublishFiles()) { return; }
+    this->showAutoPublishing();
+}
+
+void CSwiftData::showAutoPublishing()
+{
+    if (!sApp || sApp->isShuttingDown()) { return; }
     if (!m_autoPublishDialog) { m_autoPublishDialog = new CAutoPublishDialog(this); }
     m_autoPublishDialog->readAndShow();
 }
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index 3db9ec5e6..08df90a03 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -70,9 +70,11 @@ private:
     //! Check auto-publishing
     void checkAutoPublishing();
 
+    //! Show auto publishing
+    void showAutoPublishing();
+
     void performGracefulShutdown();
     void consolidationSettingChanged();
-
     void displayConsole();
     void displayLog();
     void checkMinimumVersion();
diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp
index 150c8befd..1766b64c3 100644
--- a/src/swiftdata/swiftdatamenus.cpp
+++ b/src/swiftdata/swiftdatamenus.cpp
@@ -55,7 +55,7 @@ void CSwiftData::initDynamicMenus()
     ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
 
     //  menu entry for auto publish data
-    ui->menu_Mapping->addAction(CIcons::database16(), "Auto publish data", this, &CSwiftData::checkAutoPublishing);
+    ui->menu_Mapping->addAction(CIcons::database16(), "Auto publish data", this, &CSwiftData::showAutoPublishing);
 
     QString resourceDir(CDirectoryUtils::shareDirectory());
     if (!resourceDir.isEmpty() && QDir(resourceDir).exists())
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index 17fa84e97..21a657285 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -296,7 +296,7 @@ private:
     void copyXSwiftBusDialog(bool checkFileTimestamp);
 
     //! Auto publish diloag
-    void autoPublishDialog();
+    int autoPublishDialog();
 
     //! Show auto publish dialog if appropriate
     bool triggerAutoPublishDialog();
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index 1ffe7e82f..06a81c161 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -189,12 +189,12 @@ void SwiftGuiStd::copyXSwiftBusDialog(bool checkFileTimestamp)
     if (c > 0) { CLogMessage(this).info(u"Copied %1 files from build directory") << c; }
 }
 
-void SwiftGuiStd::autoPublishDialog()
+int SwiftGuiStd::autoPublishDialog()
 {
     if (!m_autoPublishDialog)
     {
         m_autoPublishDialog.reset(new CAutoPublishDialog(this));
     }
     m_lastAutoPublish.set(QDateTime::currentMSecsSinceEpoch());
-    m_autoPublishDialog->show();
+    return m_autoPublishDialog->readAndShow();
 }