diff --git a/Changelog b/Changelog
index 52a26cc74..af00479a2 100644
--- a/Changelog
+++ b/Changelog
@@ -44,6 +44,7 @@
     - I18N: Added Hungarian translation
     - I18N: Added Brazilian translation
     - BUGFIX: Progress of paused torrents is now correct on restart
+    - BUGFIX: clear the results of a search stops searching
     - BUGFIX: Progress column gets sorted on restart it is was during last execution
     - BUGFIX: Made ETA more reliable using stats instead of instant values
     - BUGFIX: Remove torrent from hard drive used to delete parent folder if empty
diff --git a/TODO b/TODO
index 86ac628ab..cc1086013 100644
--- a/TODO
+++ b/TODO
@@ -59,3 +59,4 @@
 
 rc7->rc8 changelog:
 - BUGFIX: Fixed torrent files filtering
+- BUGFIX: Stop search when clearing results
diff --git a/src/searchEngine.cpp b/src/searchEngine.cpp
index 7e8691927..b47692a05 100644
--- a/src/searchEngine.cpp
+++ b/src/searchEngine.cpp
@@ -452,12 +452,19 @@ void SearchEngine::on_stop_search_button_clicked(){
 
 // Clear search results list
 void SearchEngine::on_clear_button_clicked(){
+  // Kill process
+  searchProcess->terminate();
+  search_stopped = true;
+
   searchResultsUrls.clear();
   SearchListModel->removeRows(0, SearchListModel->rowCount());
   // Disable clear & download buttons
   clear_button->setEnabled(false);
   download_button->setEnabled(false);
   results_lbl->setText(tr("Results")+" <i>(0)</i>:");
+  // focus on search pattern
+  search_pattern->clear();
+  search_pattern->setFocus();
 }
 
 void SearchEngine::on_clearPatternButton_clicked() {