diff --git a/public/app/features/dashboard/dashgrid/VisualizationTab.tsx b/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
index b6287bafdac..0e31d7cdafc 100644
--- a/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
+++ b/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
@@ -174,8 +174,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
             />
             <i className="gf-form-input-icon fa fa-search" />
           </label>
-          <div className="flex-grow" />
-          <button className="btn btn-link" onClick={this.onCloseVizPicker}>
+          <button className="btn btn-link toolbar__close" onClick={this.onCloseVizPicker}>
             <i className="fa fa-chevron-up" />
           </button>
         </>
diff --git a/public/sass/components/_toolbar.scss b/public/sass/components/_toolbar.scss
index 848586a41d5..5f557f89cad 100644
--- a/public/sass/components/_toolbar.scss
+++ b/public/sass/components/_toolbar.scss
@@ -43,16 +43,7 @@
   height: 20px;
 }
 
-.toolbar-subview__close {
-  background: transparent;
-  padding: 4px 8px 4px 9px;
-  border: none;
-  position: absolute;
-  right: 25px;
-  top: 20px;
-  font-size: $font-size-md;
-
-  &:hover {
-    color: $text-color-strong;
-  }
+.toolbar__close {
+  flex-grow: 1;
+  text-align: left;
 }