diff --git a/Changelog b/Changelog
index e3037aafd..94d9da523 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,7 @@
     - FEATURE: Display total amount of uploaded data in finished list
     - FEATURE: Resizing a column in a search results tab affects all tabs
     - FEATURE: Search results tab columns are now remembered upon startup
+    - FEATURE: Added right click menu in search engine to clear completion history
     - BUGFIX: Provide more helpful explanation when an I/O error occured
     - COSMETIC: Redesigned program preferences
     - COSMETIC: Updated icons set
diff --git a/src/search.ui b/src/search.ui
index 5d5a2df90..f5036472f 100644
--- a/src/search.ui
+++ b/src/search.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>search_engine</class>
- <widget class="QWidget" name="search_engine" >
-  <property name="geometry" >
+ <widget class="QWidget" name="search_engine">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,27 +10,27 @@
     <height>453</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Search</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="search_lbl" >
-       <property name="maximumSize" >
+      <widget class="QLabel" name="search_lbl">
+       <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>35</height>
         </size>
        </property>
-       <property name="font" >
+       <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
@@ -40,37 +41,40 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Search Pattern:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="search_pattern" >
-       <property name="maximumSize" >
+      <widget class="QLineEdit" name="search_pattern">
+       <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>22</height>
         </size>
        </property>
+       <property name="contextMenuPolicy">
+        <enum>Qt::CustomContextMenu</enum>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="clearPatternButton" >
-       <property name="maximumSize" >
+      <widget class="QPushButton" name="clearPatternButton">
+       <property name="maximumSize">
         <size>
          <width>34</width>
          <height>29</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
-       <property name="icon" >
-        <iconset resource="icons.qrc" >
-		<normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
+       <property name="icon">
+        <iconset resource="icons.qrc">
+         <normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
        </property>
-       <property name="iconSize" >
+       <property name="iconSize">
         <size>
          <width>30</width>
          <height>21</height>
@@ -79,37 +83,37 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="search_button" >
-       <property name="maximumSize" >
+      <widget class="QPushButton" name="search_button">
+       <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>29</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Search</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="stop_search_button" >
-       <property name="enabled" >
+      <widget class="QPushButton" name="stop_search_button">
+       <property name="enabled">
         <bool>false</bool>
        </property>
-       <property name="maximumSize" >
+       <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>29</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Stop</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="enginesButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="enginesButton">
+       <property name="text">
         <string>Search engines...</string>
        </property>
       </widget>
@@ -117,16 +121,16 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="status_lbl" >
-       <property name="maximumSize" >
+      <widget class="QLabel" name="status_lbl">
+       <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>35</height>
         </size>
        </property>
-       <property name="font" >
+       <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
@@ -137,26 +141,26 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Status:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="search_status" >
-       <property name="minimumSize" >
+      <widget class="QLabel" name="search_status">
+       <property name="minimumSize">
         <size>
          <width>400</width>
          <height>0</height>
         </size>
        </property>
-       <property name="maximumSize" >
+       <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>35</height>
         </size>
        </property>
-       <property name="font" >
+       <property name="font">
         <font>
          <family>Sans Serif</family>
          <pointsize>9</pointsize>
@@ -167,17 +171,17 @@
          <strikeout>false</strikeout>
         </font>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Stopped</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>188</width>
          <height>21</height>
@@ -188,40 +192,40 @@
     </layout>
    </item>
    <item>
-    <widget class="QTabWidget" name="tabWidget" />
+    <widget class="QTabWidget" name="tabWidget"/>
    </item>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="spacing" >
+    <layout class="QVBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QPushButton" name="download_button" >
-         <property name="enabled" >
+        <widget class="QPushButton" name="download_button">
+         <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Download</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>601</width>
            <height>20</height>
@@ -236,7 +240,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc" />
+  <include location="icons.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -245,11 +249,11 @@
    <receiver>search_button</receiver>
    <slot>click()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>421</x>
      <y>37</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>685</x>
      <y>45</y>
     </hint>
diff --git a/src/searchEngine.cpp b/src/searchEngine.cpp
index b7817b49e..0d11baa17 100644
--- a/src/searchEngine.cpp
+++ b/src/searchEngine.cpp
@@ -39,6 +39,7 @@
 #include <iostream>
 #include <QTimer>
 #include <QDir>
+#include <QMenu>
 
 #include "searchEngine.h"
 #include "bittorrent.h"
@@ -53,9 +54,8 @@ SearchEngine::SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, b
   setupUi(this);
   // new qCompleter to the search pattern
   startSearchHistory();
-  searchCompleter = new QCompleter(searchHistory, this);
-  searchCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-  search_pattern->setCompleter(searchCompleter);
+  searchCompleter = 0;
+  createCompleter();
   // Add close tab button
   closeTab_button = new QPushButton();
   closeTab_button->setIcon(QIcon(QString::fromUtf8(":/Icons/gnome-shutdown.png")));
@@ -79,6 +79,7 @@ SearchEngine::SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, b
   loadEngineSettings();
   // Update nova.py search plugin if necessary
   updateNova();
+  connect(search_pattern, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(displayPatternContextMenu(QPoint)));
 }
 
 SearchEngine::~SearchEngine(){
@@ -94,7 +95,21 @@ SearchEngine::~SearchEngine(){
 	}
   delete searchTimeout;
   delete searchProcess;
-  delete searchCompleter;
+  if(searchCompleter)
+    delete searchCompleter;
+}
+
+void SearchEngine::displayPatternContextMenu(QPoint) {
+  QMenu myMenu(this);
+  QAction clearHistoryAct(tr("Clear history"), &myMenu);
+  myMenu.addAction(&clearHistoryAct);
+  QAction *act = myMenu.exec(QCursor::pos());
+  if(act != 0) {
+    if(act == &clearHistoryAct) {
+      searchHistory.clear();
+      createCompleter();
+    }
+  }
 }
 
 void SearchEngine::tab_changed(int t)
@@ -178,12 +193,9 @@ void SearchEngine::on_search_button_clicked(){
     // verify the max size of the history
     if(searchHistory.size() > SEARCHHISTORY_MAXSIZE)
       searchHistory = searchHistory.mid(searchHistory.size()/2,searchHistory.size()/2);
-    searchCompleter = new QCompleter(searchHistory, this);
-    searchCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-    search_pattern->setCompleter(searchCompleter);
+    createCompleter();
   }
 
-
   // Getting checked search engines
   Q_ASSERT(!enabled_engines.empty());
   QStringList params;
@@ -203,6 +215,14 @@ void SearchEngine::on_search_button_clicked(){
   searchTimeout->start(180000); // 3min
 }
 
+void SearchEngine::createCompleter() {
+  if(searchCompleter)
+    delete searchCompleter;
+  searchCompleter = new QCompleter(searchHistory, this);
+  searchCompleter->setCaseSensitivity(Qt::CaseInsensitive);
+  search_pattern->setCompleter(searchCompleter);
+}
+
 void SearchEngine::propagateSectionResized(int index, int , int newsize) {
   foreach(SearchTab * tab, all_tab) {
     tab->getCurrentTreeView()->setColumnWidth(index, newsize);
diff --git a/src/searchEngine.h b/src/searchEngine.h
index 065a459d6..fea63f75a 100644
--- a/src/searchEngine.h
+++ b/src/searchEngine.h
@@ -36,6 +36,7 @@
 #include <QProcess>
 #include <QList>
 #include <QPair>
+#include <QPointer>
 #include "ui_search.h"
 #include "engineSelectDlg.h"
 #include "SearchTab.h"
@@ -57,7 +58,7 @@ class SearchEngine : public QWidget, public Ui::search_engine{
     bool no_search_results;
     QByteArray search_result_line_truncated;
     unsigned long nb_search_results;
-    QCompleter *searchCompleter;
+    QPointer<QCompleter> searchCompleter;
     QStringList searchHistory;
     bittorrent *BTSession;
     QSystemTrayIcon *myTrayIcon;
@@ -94,6 +95,8 @@ class SearchEngine : public QWidget, public Ui::search_engine{
     void saveResultsColumnsWidth();
 		void downloadFinished(int exitcode, QProcess::ExitStatus);
 		void downloadTorrent(QString engine_url, QString torrent_url);
+    void displayPatternContextMenu(QPoint);
+    void createCompleter();
 };
 
 #endif