diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py
index f58ef2fed..1a5e596f4 100644
--- a/src/gui/views/listview.py
+++ b/src/gui/views/listview.py
@@ -692,7 +692,8 @@ class ListView(NavigationView):
                     str(time.clock() - cput) + ' sec')
             # Ensure row is still selected after a change of postion in tree.
             if not self.selected_handles():
-                self.goto_handle(handle)
+                if len(handle_list) > 0:
+                    self.goto_handle(handle_list[-1])
         else:
             self.dirty = True