diff --git a/cockatrice/src/filterbuilder.cpp b/cockatrice/src/filterbuilder.cpp
index 7c4b9930..27c93781 100644
--- a/cockatrice/src/filterbuilder.cpp
+++ b/cockatrice/src/filterbuilder.cpp
@@ -42,6 +42,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
 
     setLayout(layout);
 
+    connect(filterCombo, SIGNAL(activated(int)), edit, SLOT(setFocus()));
     connect(edit, SIGNAL(returnPressed()), this, SLOT(emit_add()));
     connect(ok, SIGNAL(released()), this, SLOT(emit_add()));
     fltr = NULL;