@@ -272,9 +272,11 @@ public function store(Request $request)
      */
     public function update(Screen $screen, Request $request)
     {
+        $lastVersion = $screen->getDraftOrPublishedLatestVersion();
         $request->validate(Screen::rules($screen));
         $screen->fill($request->input());
         $original = $screen->getOriginal();
+        $screen->config = $lastVersion->config;
         $screen->saveOrFail();
         $screen->syncProjectAsset($request, Screen::class);
 
 
@@ -83,8 +83,21 @@ public function edit(Screen $screen)
     {
         $addons = $this->getPluginAddons('edit', compact(['screen']));
         $assignedProjects = json_decode($screen->projects, true);
+        
+        $lastDraftOrPublishedVersion = $screen->getDraftOrPublishedLatestVersion();
 
-        return view('processes.screens.edit', compact('screen', 'addons', 'assignedProjects'));
+        $isDraft = 0;
+        if ($lastDraftOrPublishedVersion) {
+            $isDraft = $lastDraftOrPublishedVersion->draft;
+        }
+
+        return view('processes.screens.edit', compact(
+                'screen',
+                'addons',
+                'assignedProjects',
+                'isDraft'
+            )
+        );
     }
 
     /**
 
@@ -64,8 +64,14 @@
                             </project-select>
                             <br>
                             <div class="text-right">
-                                {!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
-                                {!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-2', '@click' => 'onUpdate']) !!}
+                                {!! Form::button(__('Cancel'), [
+                                    'class'=>'btn btn-outline-secondary',
+                                    '@click' => 'onClose'
+                                ]) !!}
+                                {!! Form::button(__('Save and publish'), [
+                                    'class'=>'btn btn-secondary ml-2',
+                                    '@click' => 'onUpdate'
+                                ]) !!}
                             </div>
                         </div>
                         @isset($addons)
@@ -92,6 +98,7 @@
                 return {
                     formData: @json($screen),
                     assignedProjects: @json($assignedProjects),
+                    isDraft: @json($isDraft),
                     selectedProjects: '',
                     errors: {
                         'title': null,
@@ -123,6 +130,20 @@
                   window.location.href = projectId ? `/designer/projects/${projectId}`: '/designer/screens';
                 },
                 onUpdate() {
+                    if (this.isDraft) {
+                        ProcessMaker.confirmModal(
+                            this.$t("Caution!"),
+                            this.$t("You are about to publish a draft version. Are you sure you want to proceed?"),
+                            "",
+                            () => {
+                                this.handleUpdate();
+                            }
+                        );
+                    } else {
+                        this.handleUpdate();
+                    }
+                },
+                handleUpdate() {
                     this.resetErrors();
                     ProcessMaker.apiClient.put('screens/' + this.formData.id, this.formData)
                         .then(response => {