diff --git a/src/QueryEditor.tsx b/src/QueryEditor.tsx
index b1a98f65..af55f961 100644
--- a/src/QueryEditor.tsx
+++ b/src/QueryEditor.tsx
@@ -86,8 +86,8 @@ export const QueryEditor: ComponentType<Props> = ({ datasource, onChange, onRunQ
         </div>
         <div className="gf-form">
           <CodeEditor
-            width="500px"
-            height="100px"
+            width="100%"
+            height="250px"
             language="json"
             showLineNumbers={true}
             showMiniMap={data.length > 100}