diff --git a/src/atlas3.js b/src/atlas3.js
index 70dfbb5a..51c0575f 100644
--- a/src/atlas3.js
+++ b/src/atlas3.js
@@ -408,7 +408,6 @@ export class Atlas3 extends MetricsPanelCtrl {
         }catch(e){
             this.json_content = json;
         }
-        if(!json) return;
         this.json_index = index;
     }
     
diff --git a/src/partials/json_editor.html b/src/partials/json_editor.html
index 306ec853..a8798df2 100644
--- a/src/partials/json_editor.html
+++ b/src/partials/json_editor.html
@@ -27,6 +27,9 @@ <h5 class="gf-tabs-link">
         <button class="btn btn-secondary" ng-click="ctrl.saveToMapSrc(ctrl.json_index);">
             <i class="fa fa-save"></i>&nbsp;Save
         </button>
+        <button class="btn btn-secondary" ng-click="ctrl.saveToMapSrc(ctrl.json_index); dismiss()">
+            <i class="fa fa-save"></i>&nbsp;Save &amp; Exit
+        </button>
     </div>
 </div>
 </div>