diff --git a/public/app/features/admin/partials/edit_org.html b/public/app/features/admin/partials/edit_org.html
index c50cf2c7701..51ca261c183 100644
--- a/public/app/features/admin/partials/edit_org.html
+++ b/public/app/features/admin/partials/edit_org.html
@@ -27,8 +27,12 @@
 			<td>{{orgUser.login}}</td>
 			<td>{{orgUser.email}}</td>
 			<td>
-				<select type="text" ng-model="orgUser.role" class="gf-form-input max-width-8" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(orgUser)">
-				</select>
+        <div class="gf-form">
+          <span class="gf-form-select-wrapper">
+              <select type="text" ng-model="orgUser.role" class="gf-form-input max-width-8" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(orgUser)">
+              </select>
+          </span>
+        </div>
 			</td>
 			<td style="width: 1%">
 				<a ng-click="removeOrgUser(orgUser)" class="btn btn-danger btn-mini">
diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html
index 7686ac7f079..c047b3ac160 100644
--- a/public/app/features/admin/partials/edit_user.html
+++ b/public/app/features/admin/partials/edit_user.html
@@ -59,8 +59,10 @@
 				<input type="text" ng-model="newOrg.name" bs-typeahead="searchOrgs"	required class="gf-form-input max-width-20" placeholder="organization name">
 			</div>
 			<div class="gf-form">
-				<span class="gf-form-label">Role</span>
-				<select type="text" ng-model="newOrg.role" class="gf-form-input width-10" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']"></select>
+        <span class="gf-form-label">Role</span>
+        <span class="gf-form-select-wrapper">
+            <select type="text" ng-model="newOrg.role" class="gf-form-input width-10" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']"></select>
+        </span>
 			</div>
 			<div class="gf-form">
 				<button class="btn btn-success gf-form-btn" ng-click="addOrgUser()">Add</button>
@@ -81,8 +83,12 @@
 				{{org.name}} <span class="label label-info" ng-show="org.orgId === user.orgId">Current</span>
 			</td>
 			<td>
-				<select type="text" ng-model="org.role" class="gf-form-input max-width-12" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(org)">
-				</select>
+        <div class="gf-form">
+            <span class="gf-form-select-wrapper">
+                <select type="text" ng-model="org.role" class="gf-form-input max-width-12" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(org)">
+                </select>
+            </span>
+        </div>
 			</td>
 			<td style="width: 1%">
 				<a ng-click="removeOrgUser(org)" class="btn btn-danger btn-mini">
diff --git a/public/app/features/org/partials/invite.html b/public/app/features/org/partials/invite.html
index a35aa47a4ab..cc0f2f7817f 100644
--- a/public/app/features/org/partials/invite.html
+++ b/public/app/features/org/partials/invite.html
@@ -20,7 +20,7 @@
 				<input type="text" ng-model="ctrl.invite.name" class="gf-form-input" placeholder="name (optional)">
 			</div>
 			<div class="gf-form max-width-30">
-				<span class="gf-form-label width-10">Role</span>
+        <span class="gf-form-label width-10">Role</span>
 				<select ng-model="ctrl.invite.role" class="gf-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']">
 				</select>
 			</div>
diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html
index 96dba65d1ad..a2b4ceb6670 100644
--- a/public/app/features/org/partials/orgApiKeys.html
+++ b/public/app/features/org/partials/orgApiKeys.html
@@ -12,7 +12,9 @@
 			</div>
 			<div class="gf-form">
 				<span class="gf-form-label">Role</span>
-				<select class="gf-form-input gf-size-auto" ng-model="token.role" ng-options="r for r in roleTypes"></select>
+        <span class="gf-form-select-wrapper">
+            <select class="gf-form-input gf-size-auto" ng-model="token.role" ng-options="r for r in roleTypes"></select>
+        </span>
 			</div>
 			<div class="gf-form">
 				<button class="btn gf-form-btn btn-success" ng-click="addToken()">Add</button>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 28a2757fb2d..fcaaea3b4ee 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -51,7 +51,7 @@
         <td><span class="ellipsis">{{user.email}}</span></td>
         <td>{{user.lastSeenAtAge}}</td>
         <td>
-          <div class="gf-form-select-wrapper width-9">
+          <div class="gf-form-select-wrapper width-12">
             <select type="text" ng-model="user.role" class="gf-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="ctrl.updateOrgUser(user)">
             </select>
           </div>
diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts
index aed997f2fb3..23bbc65b2f6 100644
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -18,7 +18,6 @@ import * as heatmapPanel from 'app/plugins/panel/heatmap/module';
 import * as tablePanel from 'app/plugins/panel/table/module';
 import * as singlestatPanel from 'app/plugins/panel/singlestat/module';
 import * as gettingStartedPanel from 'app/plugins/panel/gettingstarted/module';
-import * as permissionListPlugin from 'app/plugins/panel/permissionlist/module';
 
 import * as testDataAppPlugin from 'app/plugins/app/testdata/module';
 import * as testDataDSPlugin from 'app/plugins/app/testdata/datasource/module';
@@ -37,7 +36,6 @@ const builtInPlugins = {
   "app/plugins/app/testdata/module": testDataAppPlugin,
   "app/plugins/app/testdata/datasource/module": testDataDSPlugin,
 
-  "app/plugins/panel/permissionlist/module": permissionListPlugin,
   "app/plugins/panel/text/module": textPanel,
   "app/plugins/panel/graph/module": graphPanel,
   "app/plugins/panel/dashlist/module": dashListPanel,
diff --git a/public/app/plugins/datasource/cloudwatch/partials/config.html b/public/app/plugins/datasource/cloudwatch/partials/config.html
index 1eb74923ab6..2a19e95f88c 100644
--- a/public/app/plugins/datasource/cloudwatch/partials/config.html
+++ b/public/app/plugins/datasource/cloudwatch/partials/config.html
@@ -1,7 +1,7 @@
 <h3 class="page-heading">CloudWatch details</h3>
 
 <div class="gf-form-group max-width-30">
-  <div class="gf-form">
+  <div class="gf-form gf-form-select-wrapper">
     <label class="gf-form-label width-13">Auth Provider</label>
     <select class="gf-form-input gf-max-width-13" ng-model="ctrl.current.jsonData.authType" ng-options="f.value as f.name for f in ctrl.authTypes"></select>
   </div>
diff --git a/public/app/plugins/datasource/elasticsearch/partials/config.html b/public/app/plugins/datasource/elasticsearch/partials/config.html
index 42ae4265371..da23e9ddab1 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/config.html
@@ -11,8 +11,10 @@
 		</div>
 
 		<div class="gf-form width-14">
-			<span class="gf-form-label width-9">Pattern</span>
-			<select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.interval" ng-options="f.value as f.name for f in ctrl.indexPatternTypes" ng-change="ctrl.indexPatternTypeChanged()" ></select>
+      <span class="gf-form-label width-9">Pattern</span>
+      <span class="gf-form-select-wrapper">
+          <select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.interval" ng-options="f.value as f.name for f in ctrl.indexPatternTypes" ng-change="ctrl.indexPatternTypeChanged()" ></select>
+      </span>
 		</div>
 	</div>
 
@@ -22,8 +24,10 @@
 	</div>
 
 	<div class="gf-form">
-		<span class="gf-form-label width-9">Version</span>
-		<select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.esVersion" ng-options="f.value as f.name for f in ctrl.esVersions"></select>
+    <span class="gf-form-label width-9">Version</span>
+    <span class="gf-form-select-wrapper">
+        <select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.esVersion" ng-options="f.value as f.name for f in ctrl.esVersions"></select>
+    </span>
 	</div>
     <div class="gf-form max-width-30" ng-if="ctrl.current.jsonData.esVersion>=56">
         <span class="gf-form-label width-15">Max concurrent Shard Requests</span>
diff --git a/public/app/plugins/datasource/graphite/partials/config.html b/public/app/plugins/datasource/graphite/partials/config.html
index 804d339452e..2c31aaf86b4 100644
--- a/public/app/plugins/datasource/graphite/partials/config.html
+++ b/public/app/plugins/datasource/graphite/partials/config.html
@@ -13,6 +13,8 @@
         This option controls what functions are available in the Graphite query editor.
       </info-popover>
     </span>
-		<select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.graphiteVersion" ng-options="f.value as f.name for f in ctrl.graphiteVersions"></select>
+    <span class="gf-form-select-wrapper">
+        <select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.graphiteVersion" ng-options="f.value as f.name for f in ctrl.graphiteVersions"></select>
+    </span>
 	</div>
 </div>
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 5ee712b0810..0571df226cb 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -53,6 +53,10 @@ $input-border: 1px solid $input-border-color;
   flex-direction: row;
   flex-wrap: wrap;
   align-content: flex-start;
+
+  .gf-form + .gf-form {
+    margin-right: $gf-form-margin;
+  }
 }
 
 .gf-form-button-row {
@@ -89,10 +93,6 @@ $input-border: 1px solid $input-border-color;
   margin-right: $gf-form-margin;
 }
 
-.gf-form + .gf-form {
-  margin-right: $gf-form-margin;
-}
-
 .gf-form-pre {
   display: block;
   flex-grow: 1;