diff --git a/ks_includes/widgets/keypad.py b/ks_includes/widgets/keypad.py
index 16441684..3a111beb 100644
--- a/ks_includes/widgets/keypad.py
+++ b/ks_includes/widgets/keypad.py
@@ -46,6 +46,7 @@ class Keypad(Gtk.Box):
         self.labels["keypad"] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.labels['entry'] = Gtk.Entry()
         self.labels['entry'].props.xalign = 0.5
+        self.labels['entry'].connect("activate", self.update_entry, "E")
 
         b = self._gtk.ButtonImage('cancel', _('Close'), None, 1, 1)
         b.connect("clicked", close_function)
@@ -66,7 +67,10 @@ class Keypad(Gtk.Box):
                 return
             self.labels['entry'].set_text(text[0:-1])
         elif digit == 'E':
-            temp = int(text)
+            try:
+                temp = int(text)
+            except ValueError:
+                temp = 0
             self.change_temp(temp)
             self.labels['entry'].set_text("")
         else:
diff --git a/panels/bed_mesh.py b/panels/bed_mesh.py
index 05b3a2c1..c2816e97 100644
--- a/panels/bed_mesh.py
+++ b/panels/bed_mesh.py
@@ -281,6 +281,7 @@ class BedMeshPanel(ScreenPanel):
             pl.set_hexpand(False)
             entry = Gtk.Entry()
             entry.set_hexpand(True)
+            entry.connect("activate", self.create_profile)
 
             save = self._gtk.ButtonImage("sd", _("Save"), "color3")
             save.set_hexpand(False)