diff --git a/src/autotype/AutoTypeSelectView.cpp b/src/autotype/AutoTypeSelectView.cpp
index 95c5c4066..9bdf9d92b 100644
--- a/src/autotype/AutoTypeSelectView.cpp
+++ b/src/autotype/AutoTypeSelectView.cpp
@@ -26,13 +26,8 @@ AutoTypeSelectView::AutoTypeSelectView(QWidget* parent)
     setMouseTracking(true);
     setAllColumnsShowFocus(true);
     setDragEnabled(false);
-}
 
-void AutoTypeSelectView::setEntryList(const QList<Entry*>& entries)
-{
-    EntryView::setEntryList(entries);
-
-    setCurrentIndex(model()->index(0, 0));
+    connect(model(), SIGNAL(modelReset()), SLOT(selectFirstEntry()));
 }
 
 void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
@@ -49,3 +44,12 @@ void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
 
     EntryView::mouseMoveEvent(event);
 }
+
+void AutoTypeSelectView::selectFirstEntry()
+{
+    QModelIndex index = model()->index(0, 0);
+
+    if (index.isValid()) {
+        setCurrentIndex(index);
+    }
+}
diff --git a/src/autotype/AutoTypeSelectView.h b/src/autotype/AutoTypeSelectView.h
index ee3aa5742..bcbb26278 100644
--- a/src/autotype/AutoTypeSelectView.h
+++ b/src/autotype/AutoTypeSelectView.h
@@ -29,10 +29,12 @@ class AutoTypeSelectView : public EntryView
 
 public:
     explicit AutoTypeSelectView(QWidget* parent = Q_NULLPTR);
-    void setEntryList(const QList<Entry*>& entries) Q_DECL_OVERRIDE;
 
 protected:
     void mouseMoveEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+
+private Q_SLOTS:
+    void selectFirstEntry();
 };
 
 #endif // KEEPASSX_AUTOTYPESELECTVIEW_H