diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index d16a1b8..d96485a 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -220,25 +220,37 @@ function TemperatureViewModel(settingsViewModel) {
 
     self.temperature_profiles = settingsViewModel.temperature_profiles;
 
-    self.setTemp = function(profile) {
-            $.ajax({
-                url: AJAX_BASEURL + "control/temperature",
-                type: "POST",
-                dataType: "json",
-                data: { temp: profile.extruder },
-                success: function() {$("#temp_newTemp").val("")}
-            })
-        };
-    
-    self.setBedTemp = function(profile) {
-            $.ajax({
-                url: AJAX_BASEURL + "control/temperature",
-                type: "POST",
-                dataType: "json",
-                data: { temp: profile.bed },
-                success: function() {$("#temp_newBedTemp").val("")}
-            })
-        };
+    self.setTempFromProfile = function(profile) {
+        if (!profile)
+            return;
+        self.setTemp(profile.extruder);
+    }
+
+    self.setTemp = function(temp) {
+        $.ajax({
+            url: AJAX_BASEURL + "control/temperature",
+            type: "POST",
+            dataType: "json",
+            data: { temp: temp },
+            success: function() {$("#temp_newTemp").val("")}
+        })
+    };
+
+    self.setBedTempFromProfile = function(profile) {
+        if (!profile)
+            return;
+        self.setBedTemp(profile.bed);
+    }
+
+    self.setBedTemp = function(bedTemp) {
+        $.ajax({
+            url: AJAX_BASEURL + "control/temperature",
+            type: "POST",
+            dataType: "json",
+            data: { bedTemp: bedTemp },
+            success: function() {$("#temp_newBedTemp").val("")}
+        })
+    };
 
     self.tempString = ko.computed(function() {
         if (!self.temp())
@@ -1117,8 +1129,8 @@ function SettingsViewModel() {
                 "logs": self.folder_logs()
             },
             "temperature": {
-                "profiles": self.temperature_profiles(),
-            },
+                "profiles": self.temperature_profiles()
+            }
         }
 
         $.ajax({
diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index 1e8fb0a..e73b105 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -175,13 +175,15 @@
                                             <span class="caret"></span>
                                         </button>
                                         <ul class="dropdown-menu">
-                                             <li data-bind="foreach: temperature_profiles">
-                                                 <a class="temp_newTemp_set" data-bind="click: $parent.setTemp, attr: {'data-temp' : extruder}, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
-                                             </li>
-                                             <li class="divider"></li>
-                                             <li>
-                                                 <a class="temp_newTemp_set" data-temp="0">Off</a>
-                                             </li>
+                                            <!-- ko foreach: temperature_profiles -->
+                                            <li>
+                                                <a href="#" data-bind="click: $parent.setTempFromProfile, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
+                                            </li>
+                                            <!-- /ko -->
+                                            <li class="divider"></li>
+                                            <li>
+                                                <a href="#" data-bind="click: function() { $root.setTemp(0); }">Off</a>
+                                            </li>
                                         </ul>
                                     </div>
                                 </div>
@@ -203,12 +205,14 @@
                                             <span class="caret"></span>
                                         </button>
                                         <ul class="dropdown-menu">
-                                             <li data-bind="foreach: temperature_profiles">
-                                                 <a class="temp_newBedTemp_set" data-bind="click: $parent.setBedTemp, attr: {'data-temp' : bed}, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
+                                             <!-- ko foreach: temperature_profiles -->
+                                             <li>
+                                                 <a href="#" data-bind="click: $parent.setBedTempFromProfile, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
                                              </li>
+                                             <!-- /ko -->
                                              <li class="divider"></li>
                                              <li>
-                                                 <a class="temp_newBedTemp_set" data-temp="0">Off</a>
+                                                 <a href="#" data-bind="click: function(){ $root.setBedTemp(0); }">Off</a>
                                              </li>
                                         </ul>
                                     </div>