diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 09dfe430d9..9da820c8a2 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -305,6 +305,9 @@ class CuraApplication(QtApplication):
 
         preferences.addPreference("view/invert_zoom", False)
 
+        self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement")
+        self._has_user_agreement_shown = False
+
         for key in [
             "dialog_load_path",  # dialog_save_path is in LocalFileOutputDevicePlugin
             "dialog_profile_path",
@@ -377,6 +380,22 @@ class CuraApplication(QtApplication):
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
+    onHasUserAgreementShownChanged = pyqtSignal()
+
+    @pyqtProperty(bool)
+    def needToShowUserAgreement(self):
+        return self._need_to_show_user_agreement
+
+    @pyqtProperty(bool, notify = onHasUserAgreementShownChanged)
+    def hasUserAgreementShown(self):
+        return self._has_user_agreement_shown
+
+    def setHasShownUserAgreement(self, shown = True):
+        emit_signal = self._has_user_agreement_shown != shown
+        self._has_user_agreement_shown = shown
+        if emit_signal:
+            self.onHasUserAgreementShownChanged.emit()
+
     ## The "Quit" button click event handler.
     @pyqtSlot()
     def closeApplication(self):
diff --git a/plugins/UserAgreementPlugin/UserAgreement.py b/plugins/UserAgreementPlugin/UserAgreement.py
index cfad13dfae..01788f7b57 100644
--- a/plugins/UserAgreementPlugin/UserAgreement.py
+++ b/plugins/UserAgreementPlugin/UserAgreement.py
@@ -42,7 +42,7 @@ class UserAgreement(QObject, Extension):
             Logger.log("i", "User did NOT agree to the user agreement")
             Preferences.getInstance().setValue("general/accepted_user_agreement", False)
             CuraApplication.getInstance().quit()
-
+        CuraApplication.getInstance().setHasShownUserAgreement(True)
 
     def createUserAgreementWindow(self):
         path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml"))
@@ -50,4 +50,4 @@ class UserAgreement(QObject, Extension):
         component = QQmlComponent(Application.getInstance()._engine, path)
         self._user_agreement_context = QQmlContext(Application.getInstance()._engine.rootContext())
         self._user_agreement_context.setContextProperty("manager", self)
-        self._user_agreement_window = component.create(self._user_agreement_context)
\ No newline at end of file
+        self._user_agreement_window = component.create(self._user_agreement_context)
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index cb0211f29f..8439d79d21 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -894,6 +894,11 @@ UM.MainWindow
             if(!base.visible)
             {
                 base.visible = true;
+            }
+
+            // check later if the user agreement dialog has been closed
+            if (CuraApplication.needToShowUserAgreement && !CuraApplication.hasUserAgreementShown)
+            {
                 restart();
             }
             else if(Cura.MachineManager.activeMachineId == null || Cura.MachineManager.activeMachineId == "")