diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.tsx b/packages/grafana-ui/src/components/QueryField/QueryField.tsx
index 210e35bfbdf..6692bb86966 100644
--- a/packages/grafana-ui/src/components/QueryField/QueryField.tsx
+++ b/packages/grafana-ui/src/components/QueryField/QueryField.tsx
@@ -192,7 +192,7 @@ export class UnThemedQueryField extends PureComponent<QueryFieldProps, QueryFiel
       onBlur();
     } else {
       // Run query by default on blur
-      const previousValue = this.lastExecutedValue ? Plain.serialize(this.lastExecutedValue) : null;
+      const previousValue = this.lastExecutedValue ? Plain.serialize(this.lastExecutedValue) : '';
       const currentValue = Plain.serialize(editor.value);
 
       if (previousValue !== currentValue) {
diff --git a/packages/grafana-ui/src/slate-plugins/indentation.ts b/packages/grafana-ui/src/slate-plugins/indentation.ts
index c9266f903af..d4e78355cd9 100644
--- a/packages/grafana-ui/src/slate-plugins/indentation.ts
+++ b/packages/grafana-ui/src/slate-plugins/indentation.ts
@@ -1,6 +1,7 @@
 import { isKeyHotkey } from 'is-hotkey';
 import React from 'react';
 import { RangeJSON, Range as SlateRange } from 'slate';
+import Plain from 'slate-plain-serializer';
 import { Editor, Plugin } from 'slate-react';
 
 const isIndentLeftHotkey = isKeyHotkey('mod+[');
@@ -18,7 +19,10 @@ const handleTabKey = (event: React.KeyboardEvent<Element>, editor: Editor, next:
       end: { offset: endOffset, key: endKey },
     },
   } = editor.value;
-
+  if (Plain.serialize(editor.value) === '') {
+    return;
+  }
+  event.preventDefault();
   const first = startBlock.getFirstText();
 
   const startBlockIsSelected =
@@ -82,7 +86,6 @@ export function IndentationPlugin(): Plugin {
         event.preventDefault();
         handleIndent(editor, 'right');
       } else if (event.key === 'Tab') {
-        event.preventDefault();
         handleTabKey(event, editor, next);
       } else {
         return next();