diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
index 503a6deb8f..ee8ff8ff79 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -12,34 +12,7 @@
 
     <select name="browse-type" class="form-control" aria-label="Browse Community or Collection" (change)="onSelectChange(($event.target))">
 
-      <option *ngIf="contentType=='collection'"
-        [value]="['/collections/' + id ]"
-        [routerLink]="['/collections/' + id ]"
-        routerLinkActive="active"
-        #rla="routerLinkActive"
-        [attr.selected]="rla.isActive === true ? 'selected' : null "  >
-        {{'collection.page.browse.recent.head' | translate}}
-      </option>
-
-      <option *ngIf="contentType=='community'"
-        [value]="['/communities/' + id ]"
-        [routerLink]="['/communities/' + id ]"
-        routerLinkActive="active"
-        #rla="routerLinkActive"
-        [attr.selected]="rla.isActive === true ? 'selected' : null "  >
-        {{'community.all-lists.head' | translate}}
-      </option>
-
-      <option *ngFor="let config of types"
-        [value]="['/browse/' + config.id]"
-        [routerLink]="['/browse/' + config.id]"
-        [queryParams]="{scope: id}"
-        [attr.data-params]="[id]"
-        routerLinkActive="active"
-        #rla="routerLinkActive"
-        [attr.selected]="rla.isActive === true ? 'selected' : null ">
-        {{'browse.comcol.by.' + config.id | translate}}
-      </option>
+      <option *ngFor="let option of allOptions" >{{ option.label | translate }}</option>
     </select>
   </div>
 </nav>
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 7b189e4fa8..5a3172436a 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,8 +1,17 @@
 import { Component, Inject, Input, OnInit } from '@angular/core';
+import { filter, map, startWith, tap } from 'rxjs/operators';
+import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing.module';
+import { getCommunityPageRoute } from '../../+community-page/community-page-routing.module';
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import { Router, ActivatedRoute, RouterModule } from '@angular/router';
 import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface';
 
+export interface ComColPageNavOption {
+  id: string;
+  label: string,
+  routerLink: string
+  params?: any;
+};
 /**
  * A component to display the "Browse By" section of a Community or Collection page
  * It expects the ID of the Community or Collection as input to be passed on as a scope
@@ -23,11 +32,34 @@ export class ComcolPageBrowseByComponent implements OnInit {
    */
   types: BrowseByTypeConfig[];
 
+  allOptions: ComColPageNavOption[];
+
   constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig, private router: Router) {
   }
 
   ngOnInit(): void {
-    this.types = this.config.browseBy.types;
+    this.allOptions = this.config.browseBy.types
+    .map((config: BrowseByTypeConfig) => ({
+      id: config.id,
+      label: `browse.comcol.by.${config.id}`,
+      routerLink: `/browse/${config.id}`,
+      params: { scope: this.id }
+    }));
+
+    if (this.contentType === 'collection') {
+      this.allOptions = [ {
+        id: this.id,
+        label: 'collection.page.browse.recent.head',
+        routerLink: getCollectionPageRoute(this.id)
+      }, ...this.allOptions ];
+    } else if (this.contentType === 'community') {
+      this.allOptions = [{
+          id: this.id,
+          label: 'community.all-lists.head',
+          routerLink: getCommunityPageRoute(this.id)
+        }, ...this.allOptions ];
+    }
+
   }
   onSelectChange(target) {
     const optionIndex = target.selectedIndex;