diff --git a/src/RideNavigator.h b/src/RideNavigator.h
index f4e459713..8307b58d5 100644
--- a/src/RideNavigator.h
+++ b/src/RideNavigator.h
@@ -40,6 +40,7 @@ class DiaryWindow;
 class BUGFIXQSortFilterProxyModel;
 class DataFilter;
 class GcMiniCalendar;
+class SearchBox;
 
 //
 // The RideNavigator
@@ -65,6 +66,7 @@ class RideNavigator : public GcWindow
     friend class ::GcCalendar;
     friend class ::GcMiniCalendar;
     friend class ::DataFilter;
+    friend class ::SearchBox;
 
     public:
         RideNavigator(MainWindow *, bool mainwindow = false);
diff --git a/src/SearchBox.cpp b/src/SearchBox.cpp
index e3e176ae4..43c1a5316 100644
--- a/src/SearchBox.cpp
+++ b/src/SearchBox.cpp
@@ -19,6 +19,7 @@
 #include "SearchBox.h"
 #include "MainWindow.h"
 #include "NamedSearch.h"
+#include "RideNavigator.h"
 #include "GcSideBarItem.h"
 #include <QToolButton>
 #include <QInputDialog>
@@ -190,14 +191,19 @@ void SearchBox::setMenu()
         foreach(NamedSearch x, main->namedSearches->getList()) {
             dropMenu->addAction(x.name);
         }
+        dropMenu->addSeparator();
     }
+    dropMenu->addAction(tr("Column Chooser"));
 }
 
 void SearchBox::runMenu(QAction *x)
 {
     // just qdebug for now
     if (x->text() == tr("Add Favourite")) addNamed();
-    else {
+    else if (x->text() == tr("Column Chooser")) {
+        ColumnChooser *selector = new ColumnChooser(main->listView->logicalHeadings);
+        selector->show();
+    } else {
         NamedSearch get = main->namedSearches->get(x->text());
         if (get.name == x->text()) {
             setMode(static_cast<SearchBox::SearchBoxMode>(get.type));