diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index e2d2ae5d..b15305ed 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -13,6 +13,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
     /* I did attempt to allow arbitrary gradients but cross browser support via knockout or jquery was going to be horrible */
     self.appearance_available_colors = ko.observable(["default", "red", "orange", "yellow", "green", "blue", "violet", "black"]);
 
+    self.printer_bedX = ko.observable(undefined);
+    self.printer_bedY = ko.observable(undefined);
     self.printer_movementSpeedX = ko.observable(undefined);
     self.printer_movementSpeedY = ko.observable(undefined);
     self.printer_movementSpeedZ = ko.observable(undefined);
@@ -20,7 +22,12 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
     self.printer_invertAxes = ko.observable(undefined);
     self.printer_numExtruders = ko.observable(undefined);
     self.printer_extruderOffsets = ko.observableArray([]);
-    self.printer_bedDimensions = ko.observable(undefined);
+    self.printer_bedDimensionX = ko.observable(undefined);
+    self.printer_bedDimensionY = ko.observable(undefined);
+
+    self.printer_bedDimensions = ko.dependentObservable(function () {
+    	return { "x": self.printer_bedDimensionX(), "y": self.printer_bedDimensionY() };
+    });
 
     self.webcam_streamUrl = ko.observable(undefined);
     self.webcam_snapshotUrl = ko.observable(undefined);
@@ -129,7 +136,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
         self.printer_invertAxes(response.printer.invertAxes);
         self.printer_numExtruders(response.printer.numExtruders);
         self.printer_extruderOffsets(response.printer.extruderOffsets);
-        self.printer_bedDimensions(response.printer.bedDimensions);
+        self.printer_bedDimensionX(response.printer.bedDimensions.x);
+        self.printer_bedDimensionY(response.printer.bedDimensions.y);
 
         self.webcam_streamUrl(response.webcam.streamUrl);
         self.webcam_snapshotUrl(response.webcam.snapshotUrl);
@@ -190,7 +198,10 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
                 "invertAxes": self.printer_invertAxes(),
                 "numExtruders": self.printer_numExtruders(),
                 "extruderOffsets": self.printer_extruderOffsets(),
-                "bedDimensions": self.printer_bedDimensions()
+                "bedDimensions": {
+                	"x": self.printer_bedDimensionX(),
+                	"y": self.printer_bedDimensionY()
+                }
             },
             "webcam": {
                 "streamUrl": self.webcam_streamUrl(),
diff --git a/src/octoprint/templates/settings.jinja2 b/src/octoprint/templates/settings.jinja2
index a2f8e2ac..1f561fea 100644
--- a/src/octoprint/templates/settings.jinja2
+++ b/src/octoprint/templates/settings.jinja2
@@ -82,6 +82,24 @@
                 </div>
                 <div class="tab-pane" id="settings_printerParameters">
                     <form class="form-horizontal">
+											<div class="control-group">
+												<label class="control-label" for="settings-movementSpeedX">Bed X</label>
+												<div class="controls">
+													<div class="input-append">
+														<input type="number" class="input-mini text-right" data-bind="value: printer_bedDimensionX" id="settings-bedX">
+															<span class="add-on">mm</span>
+														</div>
+												</div>
+											</div>
+											<div class="control-group">
+												<label class="control-label" for="settings-movementSpeedY">Bed Y</label>
+												<div class="controls">
+													<div class="input-append">
+														<input type="number" class="input-mini text-right" data-bind="value: printer_bedDimensionY" id="settings-bedY">
+															<span class="add-on">mm</span>
+														</div>
+												</div>
+											</div>
                         <div class="control-group">
                             <label class="control-label" for="settings-movementSpeedX">Movement Speed X Axis</label>
                             <div class="controls">