diff -r 86a3277a7317 -r 3a6cba2dd05d src/MainWindow.cpp
--- a/src/MainWindow.cpp	Sun Mar 20 21:39:06 2022 +0100
+++ b/src/MainWindow.cpp	Mon Mar 21 11:44:51 2022 +0100
@@ -97,6 +97,7 @@
     delete InventoryFermentablesWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -337,8 +338,11 @@
 void MainWindow::fromSetup()
 {
     qDebug() << Q_FUNC_INFO;
+    ui->mainStack->setCurrentIndex(-1);
+    ui->mainStack->removeWidget(SetupWindow);
     delete SetupWindow;
-    this->show();
+    setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
+    ui->menuBar->setVisible(true);
 }
 
 
@@ -346,9 +350,10 @@
 {
     qDebug() << Q_FUNC_INFO;
     SetupWindow = new Setup(this);
-    QObject::connect(SetupWindow, SIGNAL(firstWindow()), this, SLOT(fromSetup()));
-    this->hide();		// Close the main window
-    SetupWindow->show();	// Show a setup window
+    int index = ui->mainStack->count();
+    ui->mainStack->addWidget(SetupWindow);
+    ui->mainStack->setCurrentIndex(index);
+    ui->menuBar->setVisible(false);
 }
 
 
@@ -360,3 +365,16 @@
 }
 
 
+void MainWindow::windowTitle(QString msg)
+{
+    qDebug() << Q_FUNC_INFO << msg;
+    setWindowTitle(QString("BMSapp - %1 - %2").arg(VERSIONSTRING).arg(msg));
+}
+
+
+void MainWindow::statusMsg(QString msg)
+{
+    qDebug() << Q_FUNC_INFO << msg;
+    statusBar()->showMessage(msg);
+}
+