diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 1f2d4802..b8059295 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -3149,6 +3149,9 @@
     "logicClose": {
         "message": "Close"
     },
+    "save": {
+        "message": "Save"
+    },
     "active": {
         "message": "Active"
     },
diff --git a/tabs/programming.html b/tabs/programming.html
index d0195c50..096a0d0a 100644
--- a/tabs/programming.html
+++ b/tabs/programming.html
@@ -42,4 +42,9 @@
         </div>
 
     </div>
+    <div class="content_toolbar">
+        <div class="btn save_btn">
+            <a id="save-button" class="save" href="#" data-i18n="save"></a>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/tabs/programming.js b/tabs/programming.js
index a95d5c62..a5d04a1c 100644
--- a/tabs/programming.js
+++ b/tabs/programming.js
@@ -23,20 +23,7 @@ TABS.programming.initialize = function (callback, scrollPosition) {
         mspHelper.sendGlobalFunctions,
         mspHelper.saveToEeprom
     ]);
-    saveChainer.setExitPoint(reboot);
-
-    function reboot() {
-        //noinspection JSUnresolvedVariable
-        GUI.log(chrome.i18n.getMessage('configurationEepromSaved'));
-
-        GUI.tab_switch_cleanup(function() {
-            MSP.send_message(MSPCodes.MSP_SET_REBOOT, false, false, function () {
-                GUI.log(chrome.i18n.getMessage('deviceRebooting'));
-                GUI.handleReconnect($('.tab_programming a'));
-            });
-        });
-    }
-
+    
     function loadHtml() {
         GUI.load("./tabs/programming.html", processHtml);
     }
@@ -52,6 +39,11 @@ TABS.programming.initialize = function (callback, scrollPosition) {
         helper.tabs.init($('.tab-programming'));
 
         localize();
+
+        $('#save-button').click(function () {
+            saveChainer.execute();
+        });
+
         GUI.content_ready(callback);
     }
 }