diff --git a/Changelog b/Changelog
index 9922a5932..340c9ea3a 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
     - BUGFIX: Really disable torrent addition dialog by default
     - BUGFIX: Fix some missing icons in the Web UI
     - COSMETIC: Use 24px size for toolbar icons
+    - COSMETIC: Move transfer list filter on the right side of the toolbar
 
 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
     - FEATURE: Use system icons (Linux, Qt >= 4.6)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6d7d56bfe..31fef9d5a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -174,13 +174,14 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   vboxLayout->addWidget(tabs);
   // Name filter
   search_filter = new LineEdit();
-  toolBar->insertWidget(actionLock_qBittorrent, search_filter);
-  search_filter->setFixedWidth(200);
   connect(search_filter, SIGNAL(textChanged(QString)), transferList, SLOT(applyNameFilter(QString)));
-
+  QAction *searchSeparatorAct = toolBar->insertSeparator(actionLock_qBittorrent);
+  QAction *searchFilterAct = toolBar->insertWidget(searchSeparatorAct, search_filter);
+  search_filter->setFixedWidth(200);
   QWidget *spacer = new QWidget(this);
   spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-  toolBar->insertWidget(actionLock_qBittorrent, spacer);
+  toolBar->insertWidget(searchFilterAct, spacer);
+
 
   prioSeparator = toolBar->insertSeparator(actionDecreasePriority);
   prioSeparatorMenu = menu_Edit->insertSeparator(actionDecreasePriority);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 3d753b7dc..9f15e615c 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -133,7 +133,6 @@
    <addaction name="actionIncreasePriority"/>
    <addaction name="separator"/>
    <addaction name="actionOptions"/>
-   <addaction name="separator"/>
    <addaction name="actionLock_qBittorrent"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>