diff --git a/connector/syncthingprocess.cpp b/connector/syncthingprocess.cpp
index 28a7b20..9760971 100644
--- a/connector/syncthingprocess.cpp
+++ b/connector/syncthingprocess.cpp
@@ -106,7 +106,7 @@ SyncthingProcess *SyncthingProcess::s_mainInstance = nullptr;
  */
 SyncthingProcess::SyncthingProcess(QObject *parent)
     : SyncthingProcessBase(parent)
-    , m_manuallyStopped(true)
+    , m_manuallyStopped(false)
 {
     m_killTimer.setInterval(3000);
     m_killTimer.setSingleShot(true);
diff --git a/connector/syncthingservice.cpp b/connector/syncthingservice.cpp
index 78498c0..7ae7b1e 100644
--- a/connector/syncthingservice.cpp
+++ b/connector/syncthingservice.cpp
@@ -492,10 +492,10 @@ void SyncthingService::handlePropertiesChanged(
         emit stateChanged(m_activeState, m_subState, m_activeSince);
     }
     const bool currentlyRunning = isRunning();
-    if (currentlyRunning) {
-        m_manuallyStopped = false;
-    }
     if (wasRunningBefore != currentlyRunning) {
+        if (currentlyRunning) {
+            m_manuallyStopped = false;
+        }
         emit runningChanged(currentlyRunning);
     }