diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index 600dae6c16..858474240e 100644
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -108,7 +108,6 @@ class SearchSubPlugin extends Plugin
         $m->connect('search/:search/unsubscribe',
                     array('action' => 'searchunsub'),
                     array('search' => Router::REGEX_TAG));
-
         $m->connect(':nickname/search-subscriptions',
                     array('action' => 'searchsubs'),
                     array('nickname' => Nickname::DISPLAY_FMT));
diff --git a/plugins/SearchSub/searchsubmenu.php b/plugins/SearchSub/searchsubmenu.php
index 5973eb8b93..2aabb7a5a6 100644
--- a/plugins/SearchSub/searchsubmenu.php
+++ b/plugins/SearchSub/searchsubmenu.php
@@ -92,9 +92,12 @@ class SearchSubMenu extends MoreMenu
             $id = $this->menuItemID($actionName, $args);
         }
 
-        // Add 'q' as a search param, not part of the url path
-
-        $url = common_local_url($actionName, array(), $args);
+        if ($actionname == 'searchsub') {
+            // Add 'q' as a search param, not part of the url path
+            $url = common_local_url($actionName, array(), $args);
+        } else {
+            $url = common_local_url($actionName, $args);
+        }
 
         $this->out->menuItem($url,
                              $label,