diff --git a/public/app/features/dashboard/dashgrid/PanelEditor.tsx b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
index cb67db23c61..0c05d771c50 100644
--- a/public/app/features/dashboard/dashgrid/PanelEditor.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
@@ -101,7 +101,7 @@ export class PanelEditor extends React.Component<PanelEditorProps, any> {
           })}
 
           <div className="panel-editor__aside-actions">
-            <button className="btn btn-success" onClick={this.onClose}>
+            <button className="btn btn-secondary" onClick={this.onClose}>
               Back to dashboard
             </button>
             <button className="btn btn-inverse" onClick={this.onClose}>
diff --git a/public/sass/components/_timepicker.scss b/public/sass/components/_timepicker.scss
index e12835d31c1..51a730926ba 100644
--- a/public/sass/components/_timepicker.scss
+++ b/public/sass/components/_timepicker.scss
@@ -20,6 +20,7 @@
   background-color: $page-bg;
   border-radius: 0 0 0 4px;
   box-shadow: $search-shadow;
+  z-index: $zindex-dropdown;
 }
 
 .gf-timepicker-absolute-section {