diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp
index 4691ed655..6c43df3bf 100644
--- a/src/gui/entry/EntryView.cpp
+++ b/src/gui/entry/EntryView.cpp
@@ -62,13 +62,24 @@ void EntryView::keyPressEvent(QKeyEvent* event)
 void EntryView::setGroup(Group* group)
 {
     m_model->setGroup(group);
-    Q_EMIT entrySelectionChanged();
+    setFirstEntryActive();
 }
 
 void EntryView::setEntryList(const QList<Entry*>& entries)
 {
     m_model->setEntryList(entries);
-    Q_EMIT entrySelectionChanged();
+    setFirstEntryActive();
+}
+
+void EntryView::setFirstEntryActive()
+{
+    if(m_model->rowCount() > 0) {
+        QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(0, 0));
+        setCurrentEntry(m_model->entryFromIndex(index));
+    }
+    else {
+        Q_EMIT entrySelectionChanged();
+    }
 }
 
 bool EntryView::inEntryListMode()
diff --git a/src/gui/entry/EntryView.h b/src/gui/entry/EntryView.h
index ba2919e91..c11d0417d 100644
--- a/src/gui/entry/EntryView.h
+++ b/src/gui/entry/EntryView.h
@@ -42,6 +42,7 @@ public:
     void setEntryList(const QList<Entry*>& entries);
     bool inEntryListMode();
     int numberOfSelectedEntries();
+    void setFirstEntryActive();
 
 public Q_SLOTS:
     void setGroup(Group* group);