diff --git a/ChangeLog b/ChangeLog
index 207b371b0..4da3de025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 1.4.0
 -----
 1. Allow setting of custom device name for UMS and MTP devices.
+2. Allow to use table-view for earch results.
 
 1.3.0
 -----
diff --git a/gui/interfacesettings.cpp b/gui/interfacesettings.cpp
index 4ea630fe6..09fac5222 100644
--- a/gui/interfacesettings.cpp
+++ b/gui/interfacesettings.cpp
@@ -100,6 +100,8 @@ InterfaceSettings::InterfaceSettings(QWidget *p)
     addViewTypes(albumsView, true);
     addViewTypes(folderView);
     addViewTypes(playlistsView, false, true, true);
+    searchView->addItem(i18n("List"), ItemView::Mode_List);
+    searchView->addItem(i18n("Table"), ItemView::Mode_Table);
 
     addView(i18n("Play queue"), QLatin1String("PlayQueuePage"));
     addView(i18n("Artists"), QLatin1String("LibraryPage"));
@@ -208,6 +210,8 @@ void InterfaceSettings::load()
     showDeleteAction->setChecked(Settings::self()->showDeleteAction());
     selectEntry(devicesView, Settings::self()->devicesView());
     #endif
+    selectEntry(searchView, Settings::self()->searchView());
+
     playQueueGrouped->setCurrentIndex(Settings::self()->playQueueGrouped() ? 0 : 1);
     playQueueAutoExpand->setChecked(Settings::self()->playQueueAutoExpand());
     playQueueStartClosed->setChecked(Settings::self()->playQueueStartClosed());
@@ -285,6 +289,7 @@ void InterfaceSettings::save()
     Settings::self()->saveShowDeleteAction(showDeleteAction->isChecked());
     Settings::self()->saveDevicesView(getValue(devicesView));
     #endif
+    Settings::self()->saveSearchView(getValue(searchView));
     Settings::self()->savePlayQueueGrouped(constPlayQueueGrouped==playQueueGrouped->currentIndex());
     Settings::self()->savePlayQueueAutoExpand(playQueueAutoExpand->isChecked());
     Settings::self()->savePlayQueueStartClosed(playQueueStartClosed->isChecked());
diff --git a/gui/interfacesettings.ui b/gui/interfacesettings.ui
index 555b27f2e..b034ea674 100644
--- a/gui/interfacesettings.ui
+++ b/gui/interfacesettings.ui
@@ -11,16 +11,7 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -422,6 +413,16 @@ within the folder of the current track, or within its parent folder. If no image
        <item row="3" column="1">
         <widget class="QComboBox" name="devicesView"/>
        </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Search view style:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QComboBox" name="searchView"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_5">
@@ -519,15 +520,15 @@ within the folder of the current track, or within its parent folder. If no image
           </item>
           <item row="2" column="2">
            <widget class="PathRequester" name="playQueueBackgroundFile">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -544,6 +545,9 @@ within the folder of the current track, or within its parent folder. If no image
             </property>
             <item>
              <widget class="QSlider" name="playQueueBackgroundBlur">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="maximum">
                <number>20</number>
               </property>
@@ -559,22 +563,19 @@ within the folder of the current track, or within its parent folder. If no image
               <property name="tickInterval">
                <number>1</number>
               </property>
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="playQueueBackgroundBlurLabel">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="text">
                <string>10px</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
              </widget>
             </item>
            </layout>
@@ -593,6 +594,9 @@ within the folder of the current track, or within its parent folder. If no image
             </property>
             <item>
              <widget class="QSlider" name="playQueueBackgroundOpacity">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="maximum">
                <number>100</number>
               </property>
@@ -608,22 +612,19 @@ within the folder of the current track, or within its parent folder. If no image
               <property name="tickInterval">
                <number>10</number>
               </property>
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="playQueueBackgroundOpacityLabel">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="text">
                <string>40%</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
              </widget>
             </item>
            </layout>