diff --git a/GUI/Model/Model/JobQueueData.cpp b/GUI/Model/Model/JobQueueData.cpp
index ebeca2cfed680b167380ae5be8857a12d1a75958..2647605180336713f82c650d860cfb345d0ea382 100644
--- a/GUI/Model/Model/JobQueueData.cpp
+++ b/GUI/Model/Model/JobQueueData.cpp
@@ -57,6 +57,7 @@ void JobQueueData::runJob(JobItem* jobItem)
         jobItem->setComments(message);
         jobItem->setProgress(100);
         jobItem->setStatus(JobStatus::Failed);
+        clearSimulation(identifier);
         emit focusRequest(jobItem);
         return;
     }
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index 52065fbe611592c999d186f7b05ea7efe564ef68..c5c24a883fbb95073a211ba584f46061eee1ae87 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -86,9 +86,10 @@ void JobPropertiesWidget::setJobItem(JobItem* jobItem)
     m_jobItem = jobItem;
     m_propertiesModel->setJobItem(m_jobItem);
     if (m_jobItem) {
-        if (m_jobItem->isFailed())
+        if (m_jobItem->isFailed()) {
             m_tabWidget->tabBar()->setTabTextColor(JOB_MESSAGES, Qt::red);
-        else
+            m_tabWidget->setCurrentIndex(JOB_MESSAGES);
+        } else
             m_tabWidget->tabBar()->setTabTextColor(JOB_MESSAGES, Qt::black);
         m_commentsEditor->setText(m_jobItem->comments());
 
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index cd5844c53be27a19627773d9a29fc26e4ef3c980..a5203af14f548376773e8a061a7a2a125b7c8247 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -59,11 +59,8 @@ void JobView::onFocusRequest(JobItem* jobItem)
     if (jobItem->runInBackground())
         return;
 
-    QVector<JobItem*> jobs = m_jobSelector->selectedJobItems();
-    if (jobs.size() != 1 || jobItem != jobs.front()) {
-        m_jobSelector->makeJobItemSelected(jobItem);
-        setActivityAndPresentationForNewJob(jobItem);
-    }
+    m_jobSelector->makeJobItemSelected(jobItem);
+    setActivityAndPresentationForNewJob(jobItem);
 
     emit focusRequest(GUI::ID::Job);
 }