diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
index 012dbf5f..01edfc0a 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
@@ -61,13 +61,6 @@ class MainFrameController {
 
     private volatile Core core
 
-    @ControllerAction
-    void clearSearch() {
-        def searchField = builder.getVariable("search-field")
-        searchField.setSelectedItem(null)
-        searchField.requestFocus()
-    }
-    
     @ControllerAction
     void search(ActionEvent evt) {
         if (evt?.getActionCommand() == null)
diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index 9296ab73..f0c4f4fa 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -173,7 +173,7 @@ class MainFrameView {
                             borderLayout()
                             panel(constraints: BorderLayout.CENTER) {
                                 borderLayout()
-                                label("        Enter search here:", constraints: BorderLayout.WEST) // TODO: fix this
+                                label("        Enter search ", constraints: BorderLayout.WEST) // TODO: fix this
                                 
                                 def searchFieldModel = new SearchFieldModel(settings, new File(application.context.get("muwire-home")))
                                 JComboBox myComboBox = new SearchField(searchFieldModel)
@@ -183,7 +183,6 @@ class MainFrameView {
                             }
                             panel( constraints: BorderLayout.EAST) {
                                 button(text: "Search", searchAction)
-                                button(text : "", icon : imageIcon("/close_tab.png"), clearSearchAction)
                             }
                         }
                     }