diff --git a/ChangeLog b/ChangeLog
index e25f993f0..d209779b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-06-06  Moritz Bunkus  <moritz@bunkus.org>
 
+        * MKVToolNix GUI: fixed updating the number of pending jobs info
+        in the status bar when manually starting jobs. Fixes #1236.
+
         * MKVToolNix GUI: merge tool bug fix: fixed a crash when removing
         source files. Fixes #1235.
 
diff --git a/src/mkvtoolnix-gui/jobs/model.cpp b/src/mkvtoolnix-gui/jobs/model.cpp
index fc91940d1..42d9c8eb6 100644
--- a/src/mkvtoolnix-gui/jobs/model.cpp
+++ b/src/mkvtoolnix-gui/jobs/model.cpp
@@ -355,6 +355,8 @@ Model::startNextAutoJob() {
 
   QMutexLocker locked{&m_mutex};
 
+  updateJobStats();
+
   if (!m_started)
     return;
 
@@ -439,7 +441,7 @@ Model::updateJobStats() {
   auto numOther         = 0;
 
   for (auto const &job : m_jobsById)
-    if (Job::PendingAuto == job->m_status)
+    if (mtx::included_in(job->m_status, Job::PendingAuto, Job::Running))
       ++numPendingAuto;
 
     else if (Job::PendingManual == job->m_status)
diff --git a/src/mkvtoolnix-gui/jobs/tool.cpp b/src/mkvtoolnix-gui/jobs/tool.cpp
index 359bfce84..2a6746d98 100644
--- a/src/mkvtoolnix-gui/jobs/tool.cpp
+++ b/src/mkvtoolnix-gui/jobs/tool.cpp
@@ -145,6 +145,7 @@ Tool::onStartAllPending() {
     if (Job::PendingManual == job.m_status)
       job.setPendingAuto();
   });
+
   m_model->startNextAutoJob();
 }