diff --git a/ui/index.html b/ui/index.html
index 47782070..f73c9253 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -335,9 +335,9 @@
 <script src="media/js/inpainting-editor.js?v=1"></script>
 <script src="media/js/image-modifiers.js?v=7"></script>
 <script src="media/js/auto-save.js?v=8"></script>
-<script src="media/js/main.js?v=24"></script>
+<script src="media/js/main.js?v=25"></script>
 <script src="media/js/themes.js?v=4"></script>
-<script src="media/js/dnd.js?v=10"></script>
+<script src="media/js/dnd.js?v=11"></script>
 <script>
 async function init() {
     await initSettings()
diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js
index a9a93b02..9cbbe8af 100644
--- a/ui/media/js/dnd.js
+++ b/ui/media/js/dnd.js
@@ -243,7 +243,9 @@ const TASK_MAPPING = {
         parse: (val) => val
     }
 }
-function restoreTaskToUI(task) {
+function restoreTaskToUI(task, fieldsToSkip) {
+    fieldsToSkip = fieldsToSkip || []
+
     if ('numOutputsTotal' in task) {
         numOutputsTotalField.value = task.numOutputsTotal
     }
@@ -255,10 +257,47 @@ function restoreTaskToUI(task) {
         return
     }
     for (const key in TASK_MAPPING) {
-        if (key in task.reqBody) {
+        if (key in task.reqBody && !fieldsToSkip.includes(key)) {
             TASK_MAPPING[key].setUI(task.reqBody[key])
         }
     }
+
+    // restore the original tag
+    promptField.value = task.reqBody.original_prompt || task.reqBody.prompt
+
+    // Restore modifiers
+    if (task.reqBody.active_tags) {
+        refreshModifiersState(task.reqBody.active_tags)
+    }
+
+    // properly reset checkboxes
+    if (!('use_face_correction' in task.reqBody)) {
+        useFaceCorrectionField.checked = false
+    }
+    if (!('use_upscale' in task.reqBody)) {
+        useUpscalingField.checked = false
+    }
+    if (!('mask' in task.reqBody)) {
+        maskSetting.checked = false
+    }
+    upscaleModelField.disabled = !useUpscalingField.checked
+
+    // Show the source picture if present
+    initImagePreview.src = (task.reqBody.init_image == undefined ? '' : task.reqBody.init_image)
+    if (IMAGE_REGEX.test(initImagePreview.src)) {
+        Boolean(task.reqBody.mask) ? inpaintingEditor.setImg(task.reqBody.mask) : inpaintingEditor.resetBackground()
+        initImagePreviewContainer.style.display = 'block'
+        inpaintingEditorContainer.style.display = 'none'
+        promptStrengthContainer.style.display = 'table-row'
+        //samplerSelectionContainer.style.display = 'none'
+        // maskSetting.checked = false
+        inpaintingEditorContainer.style.display = maskSetting.checked ? 'block' : 'none'
+    } else {
+        initImagePreviewContainer.style.display = 'none'
+        // inpaintingEditorContainer.style.display = 'none'
+        promptStrengthContainer.style.display = 'none'
+        // maskSetting.style.display = 'none'
+    }
 }
 function readUI() {
     const reqBody = {}
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 3c717f07..2650d1dd 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -898,44 +898,9 @@ function createTask(task) {
     })
 
     task['useSettings'] = taskEntry.querySelector('.useSettings')
-    task['useSettings'].addEventListener('click', async function(e) {
-        TASK_REQ_NO_EXPORT.forEach((key) => delete task.reqBody[key]) // don't restore system settings when restoring tasks
-        restoreTaskToUI(task)
-        e.stopPropagation();
-
-        // restore the original tag
-        promptField.value = task.reqBody.original_prompt
-
-        // Restore modifiers
-        refreshModifiersState(task.reqBody.active_tags)
-
-        // properly reset checkboxes
-        if (!('use_face_correction' in task.reqBody)) {
-            useFaceCorrectionField.checked = false
-        }
-        if (!('use_upscale' in task.reqBody)) {
-            useUpscalingField.checked = false
-        }
-        if (!('mask' in task.reqBody)) {
-            maskSetting.checked = false
-        }
-
-        // Show the source picture if present
-        initImagePreview.src = (task.reqBody.init_image == undefined ? '' : task.reqBody.init_image)
-        if (IMAGE_REGEX.test(initImagePreview.src)) {
-            Boolean(task.reqBody.mask) ? inpaintingEditor.setImg(task.reqBody.mask) : inpaintingEditor.resetBackground()
-            initImagePreviewContainer.style.display = 'block'
-            inpaintingEditorContainer.style.display = 'none'
-            promptStrengthContainer.style.display = 'table-row'
-            //samplerSelectionContainer.style.display = 'none'
-            // maskSetting.checked = false
-            inpaintingEditorContainer.style.display = maskSetting.checked ? 'block' : 'none'
-        } else {
-            initImagePreviewContainer.style.display = 'none'
-            // inpaintingEditorContainer.style.display = 'none'
-            promptStrengthContainer.style.display = 'none'
-            // maskSetting.style.display = 'none'
-        }
+    task['useSettings'].addEventListener('click', function(e) {
+        e.stopPropagation()
+        restoreTaskToUI(task, TASK_REQ_NO_EXPORT)
     })
 
     imagePreview.insertBefore(taskEntry, previewTools.nextSibling)