diff --git a/src/lib/EntryView.cpp b/src/lib/EntryView.cpp
index af15afc..f7d9fc4 100644
--- a/src/lib/EntryView.cpp
+++ b/src/lib/EntryView.cpp
@@ -389,6 +389,7 @@ void KeepassEntryView::OnNewEntry(){
 		emit fileModified();
 		if (header()->isSortIndicatorShown())
 			sortByColumn(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
+		setCurrentItem(Items.back());
 	}
 
 }