diff --git a/media/css/style.css b/media/css/style.css
index bc95ba9..0f52cd7 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1022,11 +1022,11 @@ body.editing header.fixed-save div.inner {
   padding-top: 6px;
   width: 940px;
 }
-body.editing header.fixed-save div.inner .cancel, body.editing header.fixed-save div.inner .save {
+body.editing header.fixed-save div.inner .cancel, body.editing header.fixed-save div.inner .save, body.editing header.fixed-save div.inner .save-and-close {
   float: right;
   margin-left: 10px;
 }
-body.editing header.fixed-save div.inner .save {
+body.editing header.fixed-save div.inner .save-and-close {
   margin-right: 242px;
 }
 body.editing section.main div.inner section.snipts article.editing {
diff --git a/media/css/style.scss b/media/css/style.scss
index 67e7483..350f2ec 100644
--- a/media/css/style.scss
+++ b/media/css/style.scss
@@ -1151,11 +1151,11 @@ body.editing {
             padding-top: 6px;
             width: 940px;
 
-            .cancel, .save {
+            .cancel, .save, .save-and-close {
                 float: right;
                 margin-left: 10px;
             }
-            .save {
+            .save-and-close {
                 margin-right: 242px;
             }
         }
diff --git a/media/js/src/modules/snipt.js b/media/js/src/modules/snipt.js
index d9dd4ca..1073498 100644
--- a/media/js/src/modules/snipt.js
+++ b/media/js/src/modules/snipt.js
@@ -135,6 +135,11 @@
                 return false;
             });
             $('button.save', window.site.$main_edit).on('click', function() {
+                $('button.cancel').text('Close');
+                that.save();
+                return false;
+            });
+            $('button.save-and-close', window.site.$main_edit).on('click', function() {
                 that.save();
                 window.site.snipt_list.escapeUI();
                 return false;
diff --git a/snipts/templates/snipts/snipt-edit-js-template.html b/snipts/templates/snipts/snipt-edit-js-template.html
index 595bd86..9999b4b 100644
--- a/snipts/templates/snipts/snipt-edit-js-template.html
+++ b/snipts/templates/snipts/snipt-edit-js-template.html
@@ -9,6 +9,7 @@
                 <% if (snipt.id) { %>
                     <button class="delete btn btn-secondary">Delete</button>
                 <% } %>
+                <button class="save-and-close btn btn-success">Save and Close</button>
                 <button class="save btn btn-success">Save</button>
                 <button class="cancel btn btn-secondary">Cancel</button>
             </div>