diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp
index f1fb74d7e..a9b647f2f 100644
--- a/retroshare-gui/src/gui/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/SearchDialog.cpp
@@ -444,6 +444,7 @@ void SearchDialog::searchRemoveAll()
 {
 	ui.searchResultWidget->clear();
 	ui.searchSummaryWidget->clear();
+	ui.FileTypeComboBox->setCurrentIndex(0);
 	nextSearchId = 1;
 }
 
@@ -451,7 +452,6 @@ void SearchDialog::searchRemoveAll()
 void SearchDialog::clearKeyword()
 {
  	ui.lineEdit->clear();
- 	ui.FileTypeComboBox->setCurrentIndex(0);
  	ui.lineEdit->setFocus();
 }
 
diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui
index 6e7ce2c2c..fd30427ed 100644
--- a/retroshare-gui/src/gui/SearchDialog.ui
+++ b/retroshare-gui/src/gui/SearchDialog.ui
@@ -1097,7 +1097,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
 </string>
        </property>
        <property name="text">
-        <string>Clear all Search Results</string>
+        <string>Close All Search Results</string>
        </property>
       </widget>
      </item>