diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index aa7330950..8a993d33d 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -128,6 +128,7 @@ MainWindow::MainWindow()
                              ? QKeySequence::Find
                              : QKeySequence(Qt::CTRL + Qt::Key_F);
     connect(new QShortcut(seq, this), SIGNAL(activated()), m_ui->searchField, SLOT(setFocus()));
+    m_ui->searchField->setContentsMargins(5,0,5,0);
     m_ui->actionEntryNew->setShortcut(Qt::CTRL + Qt::Key_N);
     m_ui->actionEntryEdit->setShortcut(Qt::CTRL + Qt::Key_E);
     m_ui->actionEntryDelete->setShortcut(Qt::CTRL + Qt::Key_D);
@@ -248,7 +249,8 @@ MainWindow::MainWindow()
 
     m_ui->searchField->setPlaceholderText(tr("Type to search"));
     m_ui->searchField->setEnabled(false);
-    m_ui->toolBar->addWidget(m_ui->searchPanel);
+    m_ui->toolBar->addWidget(m_ui->mySpacer);
+    m_ui->toolBar->addWidget(m_ui->searchField);
     m_actionMultiplexer.connect(m_ui->searchField, SIGNAL(textChanged(QString)),
                                 SLOT(search(QString)));
     QMenu* searchMenu = new QMenu(this);
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index cd40a86fd..7585a7549 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -55,34 +55,6 @@
       </widget>
       <widget class="QWidget" name="pageWelcome">
        <layout class="QVBoxLayout" name="verticalLayout_5">
-        <item>
-         <widget class="QWidget" name="searchPanel" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QSearchField" name="searchField" native="true"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
         <item>
          <widget class="WelcomeWidget" name="welcomeWidget" native="true"/>
         </item>
@@ -214,6 +186,17 @@
    <addaction name="actionEntryCopyPassword"/>
    <addaction name="separator"/>
    <addaction name="actionLockDatabases"/>
+   <widget class="QWidget" name="mySpacer">
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+   </widget>
+   <widget class="QWidget" name="searchPanel">
+    <widget class="QSearchField" name="searchField" native="true"/>
+   </widget>
   </widget>
   <action name="actionQuit">
    <property name="text">
diff --git a/src/gui/SearchWidget.ui b/src/gui/SearchWidget.ui
index 0e2121617..9f3348074 100644
--- a/src/gui/SearchWidget.ui
+++ b/src/gui/SearchWidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>630</width>
-    <height>34</height>
+    <height>16</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -32,10 +32,6 @@
  </widget>
  <tabstops>
   <tabstop>closeSearchButton</tabstop>
-  <tabstop>searchEdit</tabstop>
-  <tabstop>caseSensitiveCheckBox</tabstop>
-  <tabstop>searchCurrentRadioButton</tabstop>
-  <tabstop>searchRootRadioButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>