diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
index 8989d8d36e6..f69084e05b9 100644
--- a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
@@ -131,6 +131,7 @@ class UnthemedCodeEditor extends React.PureComponent<Props> {
         top: 0.5 * theme.spacing.gridSize,
         bottom: 0.5 * theme.spacing.gridSize,
       },
+      fixedOverflowWidgets: true, // Ensures suggestions menu is drawn on top
     };
 
     if (!showLineNumbers) {