diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index a6bc170fddd..62258a25e7d 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -84,7 +84,11 @@ export class SideMenuCtrl {
        return;
      }
 
-     if (this.orgItems.length < this.maxShownOrgs && (this.orgFilter === '' || org.name.indexOf(this.orgFilter) !== -1)){
+     if (this.orgItems.length === this.maxShownOrgs) {
+       return;
+     }
+
+     if (this.orgFilter === '' || (org.name.toLowerCase().indexOf(this.orgFilter.toLowerCase()) !== -1)) {
        this.orgItems.push({
          text: "Switch to " + org.name,
          icon: "fa fa-fw fa-random",