diff --git a/bin/key-mapper-gtk b/bin/key-mapper-gtk
index 090eaba5..b580cfd2 100755
--- a/bin/key-mapper-gtk
+++ b/bin/key-mapper-gtk
@@ -96,9 +96,9 @@ class Window:
 
         # find an select the newest preset based on file modification dates
         device, preset = find_newest_preset()
-        if device:
+        if device is not None:
             self.on_select_device(device)
-        if preset:
+        if preset is not None:
             self.on_select_preset(preset)
 
     def get(self, name):
@@ -139,7 +139,7 @@ class Window:
         """Create a new preset and select it."""
         new_preset = create_preset(self.selected_device)
         self.get('preset_selection').append(new_preset, new_preset)
-        self.on_select_preset(new_preset)
+        self.get('preset_selection').set_active_id(new_preset)
 
     def on_select_preset(self, preset):
         """Show the mappings of the preset"""
@@ -155,8 +155,6 @@ class Window:
             key_list.remove_row(i + 1)
         self.rows = 0
 
-        self.get('preset_selection').set_active_id(preset)
-
         # TODO show all mapped keys from config
 
         self.on_add_key_clicked()
diff --git a/tests/testcases/integration.py b/tests/testcases/integration.py
index decd190f..094a0f9b 100644
--- a/tests/testcases/integration.py
+++ b/tests/testcases/integration.py
@@ -91,7 +91,7 @@ class Integration(unittest.TestCase):
         self.assertTrue(self.window.window.get_visible())
 
     def test_select_device_and_preset(self):
-        class FakeDropdown:
+        class FakeDropdown(Gtk.ComboBoxText):
             def __init__(self, name):
                 self.name = name