diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/coregui/Views/SimulationView.cpp
index e61bfa6d23888a7d392b591791457ea8615d57ca..d2881207865e3f3280826b69b3bb283d5a19a6d2 100644
--- a/GUI/coregui/Views/SimulationView.cpp
+++ b/GUI/coregui/Views/SimulationView.cpp
@@ -18,16 +18,13 @@
 #include "mainwindow.h"
 #include <QVBoxLayout>
 
-SimulationView::SimulationView(MainWindow *mainWindow)
-    : QWidget(mainWindow)
-    , m_simulationSetupWidget(new SimulationSetupWidget)
-    , m_toolBar(new StyledToolBar)
+SimulationView::SimulationView(MainWindow* mainWindow)
+    : QWidget(mainWindow), m_simulationSetupWidget(new SimulationSetupWidget),
+      m_toolBar(new StyledToolBar)
 {
-    m_toolBar->setMinimumSize(24, 24);
-
     m_simulationSetupWidget->setApplicationModels(mainWindow->models());
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
     mainLayout->addWidget(m_toolBar);
     mainLayout->addWidget(m_simulationSetupWidget);
@@ -36,13 +33,17 @@ SimulationView::SimulationView(MainWindow *mainWindow)
     setLayout(mainLayout);
 }
 
+void SimulationView::onRunSimulationShortcut()
+{
+    m_simulationSetupWidget->onRunSimulation();
+}
 
-void SimulationView::updateSimulationViewElements()
+void SimulationView::showEvent(QShowEvent*)
 {
-    m_simulationSetupWidget->updateViewElements();
+    updateSimulationViewElements();
 }
 
-void SimulationView::onRunSimulationShortcut()
+void SimulationView::updateSimulationViewElements()
 {
-    m_simulationSetupWidget->onRunSimulation();
+    m_simulationSetupWidget->updateViewElements();
 }
diff --git a/GUI/coregui/Views/SimulationView.h b/GUI/coregui/Views/SimulationView.h
index 5b5ffbbc3a7ca397f41b95174a40a57f84353e41..58d23b9d6e1ad90dc44c95e11571ba5ed585004d 100644
--- a/GUI/coregui/Views/SimulationView.h
+++ b/GUI/coregui/Views/SimulationView.h
@@ -27,19 +27,19 @@ class BA_CORE_API_ SimulationView : public QWidget
     Q_OBJECT
 
 public:
-    enum ETabViewId { SIMULATION_SETUP, QUICK_SIMULATION};
-    SimulationView(MainWindow *mainWindow);
+    SimulationView(MainWindow* mainWindow);
 
-    void updateSimulationViewElements();
+protected:
+    void showEvent(QShowEvent*);
 
 public slots:
     void onRunSimulationShortcut();
 
 private:
-    SimulationSetupWidget *m_simulationSetupWidget;
-    StyledToolBar *m_toolBar;
-};
+    void updateSimulationViewElements();
 
+    SimulationSetupWidget* m_simulationSetupWidget;
+    StyledToolBar* m_toolBar;
+};
 
 #endif // SIMULATIONVIEW_H
-
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index 821a2ea46e2c6210d16fa63898a64ba7ca8a4db2..a3ee08f743d4f7b4d3e896d44e6ec2ee2df9a891 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -112,8 +112,6 @@ void MainWindow::onChangeTabWidget(int index)
 {
     if (index == WELCOME)
         m_welcomeView->updateRecentProjectPanel();
-    else if (index == SIMULATION)
-        m_simulationView->updateSimulationViewElements();
 }
 
 void MainWindow::onFocusRequest(int index)