diff --git a/src/atcore.cpp b/src/atcore.cpp
--- a/src/atcore.cpp
+++ b/src/atcore.cpp
@@ -326,7 +326,6 @@
     setExtruderTemp(0, 0);
     setBedTemp(0);
     home('X');
-    setState(IDLE);
 }
 
 void AtCore::emergencyStop()
diff --git a/src/printthread.cpp b/src/printthread.cpp
--- a/src/printthread.cpp
+++ b/src/printthread.cpp
@@ -62,7 +62,8 @@
         break;
 
     case STOP: {
-        d->gcodestream->setString(NULL);
+        QString newString(QStringLiteral(";ENDFILE"));
+        d->gcodestream->setString(&newString);
         setState(IDLE);
         break;
     }