diff --git a/src/autotype/AutoTypeSelectView.cpp b/src/autotype/AutoTypeSelectView.cpp
index 76d57ec60..7d9db4130 100644
--- a/src/autotype/AutoTypeSelectView.cpp
+++ b/src/autotype/AutoTypeSelectView.cpp
@@ -19,7 +19,6 @@
 
 #include <QKeyEvent>
 #include <QMouseEvent>
-#include <QDebug>
 
 AutoTypeSelectView::AutoTypeSelectView(QWidget* parent)
     : EntryView(parent)
@@ -59,14 +58,8 @@ void AutoTypeSelectView::selectFirstEntry()
 
 void AutoTypeSelectView::keyReleaseEvent(QKeyEvent* e)
 {
-    qDebug() << e->key();
-
-    if (!e->modifiers() || (e->modifiers() & Qt::KeypadModifier && e->key() == Qt::Key_Enter)) {
-        if (e->key() == Qt::Key_Escape) {
-            emit rejected();
-        } else {
-            e->ignore();
-        }
+    if (e->key() == Qt::Key_Escape) {
+        emit rejected();
     } else {
         e->ignore();
     }
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index 08228ea1f..c9c10aa56 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -153,12 +153,8 @@ void PasswordGeneratorWidget::setStandaloneMode(bool standalone)
 
 void PasswordGeneratorWidget::keyPressEvent(QKeyEvent* e)
 {
-    if (!e->modifiers() || (e->modifiers() & Qt::KeypadModifier && e->key() == Qt::Key_Enter)) {
-        if (e->key() == Qt::Key_Escape && m_standalone == true) {
-            emit dialogTerminated();
-        } else {
-            e->ignore();
-        }
+    if (e->key() == Qt::Key_Escape && m_standalone == true) {
+        emit dialogTerminated();
     } else {
         e->ignore();
     }
diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp
index ceb3c64a0..36d60ced5 100644
--- a/src/gui/entry/EntryView.cpp
+++ b/src/gui/entry/EntryView.cpp
@@ -121,6 +121,20 @@ void EntryView::keyPressEvent(QKeyEvent* event)
 #endif
     }
 
+    int last = m_model->rowCount() - 1;
+
+    if (event->key() == Qt::Key_Up && currentIndex().row() == 0) {
+        QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(last, 0));
+        setCurrentEntry(m_model->entryFromIndex(index));
+        return;
+    }
+
+    if (event->key() == Qt::Key_Down && currentIndex().row() == last) {
+        QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(0, 0));
+        setCurrentEntry(m_model->entryFromIndex(index));
+        return;
+    }
+
     QTreeView::keyPressEvent(event);
 }