diff --git a/src/js/controller/settings/ApplicationSettingsController.js b/src/js/controller/settings/ApplicationSettingsController.js
index dd7e1f49..663be97f 100644
--- a/src/js/controller/settings/ApplicationSettingsController.js
+++ b/src/js/controller/settings/ApplicationSettingsController.js
@@ -38,6 +38,10 @@
     var maxFpsInput = document.querySelector('.max-fps-input');
     maxFpsInput.value = pskl.UserSettings.get(pskl.UserSettings.MAX_FPS);
     this.addEventListener(maxFpsInput, 'change', this.onMaxFpsChange_);
+
+    // Form
+    this.applicationSettingsForm = document.querySelector('[name="application-settings-form"]');
+    this.addEventListener(this.applicationSettingsForm, 'submit', this.onFormSubmit_);
   };
 
   ns.ApplicationSettingsController.prototype.onGridWidthChange_ = function (evt) {
@@ -72,4 +76,9 @@
     }
   };
 
+  ns.ApplicationSettingsController.prototype.onFormSubmit_ = function (evt) {
+    evt.preventDefault();
+    $.publish(Events.CLOSE_SETTINGS_DRAWER);
+  };
+
 })();
\ No newline at end of file
diff --git a/src/templates/settings/application.html b/src/templates/settings/application.html
index 836e1ca7..d42585d3 100644
--- a/src/templates/settings/application.html
+++ b/src/templates/settings/application.html
@@ -1,51 +1,55 @@
-<div class="settings-section">
-  <div class="settings-title">
-    General
-  </div>
-  <div class="settings-item">
-    <label>Background:</label>
-    <div class="background-picker-wrapper">
-      <div class="background-picker light-picker-background" data-background="light-canvas-background"
-            rel="tooltip" data-placement="bottom" title="light / high contrast">
-      </div>
-      <div class="background-picker medium-picker-background" data-background="medium-canvas-background"
-            rel="tooltip" data-placement="bottom" title="medium / high contrast">
-      </div>
-      <div class="background-picker lowcont-medium-picker-background" data-background="lowcont-medium-canvas-background"
-            rel="tooltip" data-placement="bottom" title="medium / low contrast">
-      </div>
-      <div class="background-picker lowcont-dark-picker-background" data-background="lowcont-dark-canvas-background"
-            rel="tooltip" data-placement="bottom" title="dark / low contrast">
+<form action="" method="POST" name="application-settings-form">
+  <div class="settings-section">
+    <div class="settings-title">
+      General
+    </div>
+    <div class="settings-item">
+      <label>Background:</label>
+      <div class="background-picker-wrapper">
+        <div class="background-picker light-picker-background" data-background="light-canvas-background"
+              rel="tooltip" data-placement="bottom" title="light / high contrast">
+        </div>
+        <div class="background-picker medium-picker-background" data-background="medium-canvas-background"
+              rel="tooltip" data-placement="bottom" title="medium / high contrast">
+        </div>
+        <div class="background-picker lowcont-medium-picker-background" data-background="lowcont-medium-canvas-background"
+              rel="tooltip" data-placement="bottom" title="medium / low contrast">
+        </div>
+        <div class="background-picker lowcont-dark-picker-background" data-background="lowcont-dark-canvas-background"
+              rel="tooltip" data-placement="bottom" title="dark / low contrast">
+        </div>
       </div>
     </div>
-  </div>
-  <div class="settings-item">
-    <label for="grid-width">Grid :</label>
-    <select id="grid-width" class="grid-width-select">
-      <option value="0">Disabled</option>
-      <option value="1">1px</option>
-      <option value="2">2px</option>
-      <option value="3">3px</option>
-      <option value="4">4px</option>
-    </select>
-  </div>
-</div>
-
-<div class="settings-section">
-  <div class="settings-title">
-    Preview
+    <div class="settings-item">
+      <label for="grid-width">Grid :</label>
+      <select id="grid-width" class="grid-width-select">
+        <option value="0">Disabled</option>
+        <option value="1">1px</option>
+        <option value="2">2px</option>
+        <option value="3">3px</option>
+        <option value="4">4px</option>
+      </select>
+    </div>
   </div>
 
-  <div class="settings-item">
-    <label>
-      <input type="checkbox" value="1" class="tiled-preview-checkbox" name="tiled-preview-checkbox"/>
-      Repeated preview
-    </label>
-  </div>
+  <div class="settings-section">
+    <div class="settings-title">
+      Preview
+    </div>
 
-  <div class="settings-item">
-    <label for="tiled-preview">Maximum FPS </label>
-        <input type="text" class="textfield  textfield-small  max-fps-input" name="max-fps"/>
-  </div>
-</div>
+    <div class="settings-item">
+      <label>
+        <input type="checkbox" value="1" class="tiled-preview-checkbox" name="tiled-preview-checkbox"/>
+        Repeated preview
+      </label>
+    </div>
+
+    <div class="settings-item">
+      <label for="tiled-preview">Maximum FPS </label>
+          <input type="text" class="textfield  textfield-small  max-fps-input" name="max-fps"/>
+    </div>
+
+    <input type="submit" class="button button-primary" value="Save" />
+  </div>
+</form>