diff --git a/resources/js/processes/screen-builder/screen.vue b/resources/js/processes/screen-builder/screen.vue
index 0c8f1188ee..aaf9ae8447 100644
--- a/resources/js/processes/screen-builder/screen.vue
+++ b/resources/js/processes/screen-builder/screen.vue
@@ -41,7 +41,10 @@
           id="preview"
           class="h-100 m-0"
         >
-          <b-col class="d-flex overflow-auto h-100">
+          <b-col
+            ref="preview-screen"
+            class="d-flex overflow-auto h-100"
+          >
             <vue-form-renderer
               v-if="renderComponent === 'task-screen'"
               ref="renderer"
@@ -56,6 +59,7 @@
               :show-errors="true"
               :mock-magic-variables="mockMagicVariables"
               :device-screen="deviceScreen"
+              @update-page-task="updatePage"
               @submit="previewSubmit"
               @update="onUpdate"
               @css-errors="cssErrors = $event"
@@ -77,6 +81,7 @@
                 :watchers="preview.watchers"
                 :data="previewData"
                 :type="screen.type"
+                @update-page-task="updatePage"
                 @update="onUpdate"
                 @submit="previewSubmit"
               />
@@ -1237,6 +1242,11 @@ export default {
         4,
       );
     },
+    updatePage() {
+      if (this.$refs["preview-screen"]) {
+        this.$refs["preview-screen"].scrollTop = 0;
+      }
+    },
   },
 };
 </script>
diff --git a/resources/js/tasks/edit.js b/resources/js/tasks/edit.js
index 5cc6a890fa..5f493f1d77 100644
--- a/resources/js/tasks/edit.js
+++ b/resources/js/tasks/edit.js
@@ -392,6 +392,9 @@ const main = new Vue({
     taskUpdated(task) {
       this.task = task;
     },
+    updatePage() {
+      document.getElementById("tabContent").scrollTop = 0;
+    },
     updateScreenFields(taskId) {
       return ProcessMaker.apiClient
         .get(`tasks/${taskId}/screen_fields`)
diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index 671778fa7a..c0d8c58679 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -36,7 +36,7 @@ function() use ($task) {
     <div
       class="tw-flex tw-w-full tw-grow px-3">
       <div class="tw-flex tw-w-full tw-grow">
-        <div class="tw-flex tw-flex-col tw-grow">
+        <div class="tw-flex tw-flex-col tw-grow tw-overflow-hidden container-height">
           <div 
             v-if="isSelfService"
             class="alert alert-primary"
@@ -99,6 +99,7 @@ class="card border-0"
                   initial-loop-context="{{ $task->getLoopContext() }}"
                   :wait-loading-listeners="true"
                   @task-updated="taskUpdated"
+                  @updated-page-core="updatePage"
                   @submit="submit"
                   @completed="completed"
                   @@error="error"