diff --git a/public/app/core/components/org_switcher.ts b/public/app/core/components/org_switcher.ts
index 1816e11af49..f7b53fa3c81 100644
--- a/public/app/core/components/org_switcher.ts
+++ b/public/app/core/components/org_switcher.ts
@@ -15,8 +15,7 @@ const template = `
 		</a>
 	</div>
 
-	<div class="modal-content">
-    <div class="gf-form-group">
+  <div class="modal-content modal-content--has-scroll" grafana-scrollbar>
     <table class="filter-table form-inline">
 			<thead>
 				<tr>
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index df435462549..260c1c9fc4d 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -67,6 +67,11 @@
 
 .modal-content {
   padding: $spacer*2;
+
+  &--has-scroll {
+    max-height: calc(100vh - 400px);
+    position: relative;
+  }
 }
 
 // Remove bottom margin if need be