diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index f255797cc..020ff76e6 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -2096,7 +2096,7 @@ MainWindow::searchFocusIn()
     anim->setDuration(300);
     anim->setEasingCurve(QEasingCurve::InOutQuad);
     anim->setStartValue(searchBox->width());
-    anim->setEndValue(400);
+    anim->setEndValue(300);
     anim->start(QPropertyAnimation::DeleteWhenStopped);
 }
 
diff --git a/src/SearchBox.cpp b/src/SearchBox.cpp
index 11d9ec7a6..130c61e77 100644
--- a/src/SearchBox.cpp
+++ b/src/SearchBox.cpp
@@ -32,7 +32,7 @@
 #include <QDebug>
 
 SearchBox::SearchBox(Context *context, QWidget *parent, bool nochooser)
-    : QLineEdit(parent), context(context), filtered(false), nochooser(nochooser)
+    : QLineEdit(parent), context(context), parent(parent), filtered(false), nochooser(nochooser)
 {
     setFixedHeight(21);
     //clear button
@@ -69,7 +69,7 @@ SearchBox::SearchBox(Context *context, QWidget *parent, bool nochooser)
     connect(searchButton, SIGNAL(clicked()), this, SLOT(toggleMode()));
 
     // create an empty completer, configchanged will fix it
-    completer = new QCompleter(QStringList(), this);
+    completer = new QCompleter(QStringList(), parent);
 
 #ifdef Q_OS_MAC
     setAttribute(Qt::WA_MacShowFocusRect, 0);
@@ -172,8 +172,8 @@ SearchBox::configChanged(qint32)
     }
 
     // set new completer
-    completer = new QCompleter(list, this);
-    //if (mode == Filter) setCompleter(completer);
+    completer = new QCompleter(list, parent);
+    if (mode == Filter) setCompleter(completer);
 }
 
 void SearchBox::resizeEvent(QResizeEvent *)
@@ -209,7 +209,7 @@ void SearchBox::setMode(SearchBoxMode mode)
             searchButton->setIcon(filter);
             searchButton->setIconSize(QSize(11,11));
             setPlaceholderText(tr("Filter..."));
-            //setCompleter(completer);
+            setCompleter(completer);
         }
         break;
 
@@ -220,7 +220,7 @@ void SearchBox::setMode(SearchBoxMode mode)
             searchButton->setIcon(search);
             searchButton->setIconSize(QSize(11,11));
             setPlaceholderText(tr("Search..."));
-            //setCompleter(NULL);
+            setCompleter(NULL);
         }
         break;
     }
diff --git a/src/SearchBox.h b/src/SearchBox.h
index 231c86b0a..c5c475167 100644
--- a/src/SearchBox.h
+++ b/src/SearchBox.h
@@ -101,6 +101,7 @@ signals:
 
 private:
     Context *context;
+    QWidget *parent;
     bool filtered;
     bool nochooser;
     QToolButton *clearButton, *searchButton, *toolButton;