1 files changed, 14 insertions, 7 deletions
diff --git a/src/autotype/AutoTypeSelectView.cpp b/src/autotype/AutoTypeSelectView.cpp
index 717e20a31..e4dba0515 100644
--- a/src/autotype/AutoTypeSelectView.cpp
+++ b/src/autotype/AutoTypeSelectView.cpp
@@ -17,18 +17,16 @@
 
 #include "AutoTypeSelectView.h"
 
+#include <QKeyEvent>
 #include <QMouseEvent>
 
 AutoTypeSelectView::AutoTypeSelectView(QWidget* parent)
-    : EntryView(parent)
+    : AutoTypeMatchView(parent)
 {
-    hideColumn(3);
     setMouseTracking(true);
     setAllColumnsShowFocus(true);
-    setDragEnabled(false);
-    setSelectionMode(QAbstractItemView::SingleSelection);
 
-    connect(model(), SIGNAL(modelReset()), SLOT(selectFirstEntry()));
+    connect(model(), SIGNAL(modelReset()), SLOT(selectFirstMatch()));
 }
 
 void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
@@ -43,10 +41,10 @@ void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
         unsetCursor();
     }
 
-    EntryView::mouseMoveEvent(event);
+    AutoTypeMatchView::mouseMoveEvent(event);
 }
 
-void AutoTypeSelectView::selectFirstEntry()
+void AutoTypeSelectView::selectFirstMatch()
 {
     QModelIndex index = model()->index(0, 0);
 
@@ -54,3 +52,12 @@ void AutoTypeSelectView::selectFirstEntry()
         setCurrentIndex(index);
     }
 }
+
+void AutoTypeSelectView::keyReleaseEvent(QKeyEvent* e)
+{
+    if (e->key() == Qt::Key_Escape) {
+        emit rejected();
+    } else {
+        e->ignore();
+    }
+}
+\ No newline at end of file