diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py
index db22f6a0..b83c1d50 100755
--- a/terminatorlib/prefseditor.py
+++ b/terminatorlib/prefseditor.py
@@ -2115,6 +2115,12 @@ def update_profiles(self):
 
     def on_layout_selection_changed(self, selection):
         """A different layout was selected"""
+        #reset the layout item to first item when a diff
+        #layout is selected and highlight
+        if self.treestore.get_iter_first():
+            path = Gtk.TreePath.new_from_indices([0])
+            self.treeview.set_cursor(path, None, False)
+
         (listmodel, rowiter) = selection.get_selected()
         if not rowiter:
             # Something is wrong, just jump to the first item in the list
@@ -2136,6 +2142,7 @@ def on_layout_selection_changed(self, selection):
         command.set_sensitive(False)
         chooser.set_sensitive(False)
         workdir.set_sensitive(False)
+        self.treeview.grab_focus()
 
     def on_layout_item_selection_changed(self, selection):
         """A different item in the layout was selected"""