diff --git a/MsgPopup.qml b/MsgPopup.qml
index 9aece09..a044b19 100644
--- a/MsgPopup.qml
+++ b/MsgPopup.qml
@@ -20,6 +20,7 @@ Popup {
     property alias title: msgpopupheader.text
     property alias text: msgpopupbody.text
     property bool continueButton: true
+    property bool quitButton: false
     property bool yesButton: false
     property bool noButton: false
     signal yes()
@@ -130,6 +131,18 @@ Popup {
                 Accessible.onPressAction: clicked()
             }
 
+            Button {
+                text: qsTr("QUIT")
+                onClicked: {
+                    Qt.quit()
+                }
+                Material.foreground: "#ffffff"
+                Material.background: "#c51a4a"
+                font.family: roboto.name
+                visible: msgpopup.quitButton
+                Accessible.onPressAction: clicked()
+            }
+
             Text { text: " " }
         }
     }
diff --git a/main.qml b/main.qml
index f212f5d..dce473f 100644
--- a/main.qml
+++ b/main.qml
@@ -903,6 +903,11 @@ ApplicationWindow {
             msgpopup.text = qsTr("<b>%1</b> has been erased<br><br>You can now remove the SD card from the reader").arg(dstbutton.text)
         else
             msgpopup.text = qsTr("<b>%1</b> has been written to <b>%2</b><br><br>You can now remove the SD card from the reader").arg(osbutton.text).arg(dstbutton.text)
+        if (imageWriter.isEmbeddedMode()) {
+            msgpopup.continueButton = false
+            msgpopup.quitButton = true
+        }
+
         msgpopup.openPopup()
         imageWriter.setDst("")
         dstbutton.text = qsTr("CHOOSE STORAGE")
@@ -959,7 +964,7 @@ ApplicationWindow {
             if ("imager" in o) {
                 var imager = o["imager"]
                 if ("latest_version" in imager && "url" in imager) {
-                    if (imageWriter.isVersionNewer(imager["latest_version"])) {
+                    if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) {
                         updatepopup.url = imager["url"]
                         updatepopup.openPopup()
                     }