diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
index a72bc585a65..634a642c65e 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -50,7 +50,6 @@ export class LokiQueryEditor extends PureComponent<Props> {
     const formatOptions: SelectOptionItem[] = [
       { label: 'Time Series', value: 'time_series' },
       { label: 'Table', value: 'table' },
-      { label: 'Logs', value: 'logs' },
     ];
 
     query.resultFormat = query.resultFormat || 'time_series';
@@ -64,9 +63,14 @@ export class LokiQueryEditor extends PureComponent<Props> {
           onQueryChange={this.onFieldChange}
           onPressEnter={this.onRunQuery}
         />
-        <div className="gf-form">
-          <div className="gf-form-label">Format as</div>
-          <Select isSearchable={false} options={formatOptions} onChange={this.onFormatChanged} value={currentFormat} />
+        <div className="gf-form-inline">
+          <div className="gf-form">
+            <div className="gf-form-label">Format as</div>
+            <Select isSearchable={false} options={formatOptions} onChange={this.onFormatChanged} value={currentFormat} />
+          </div>
+          <div className="gf-form gf-form--grow">
+            <div className="gf-form-label gf-form-label--grow" />
+          </div>
         </div>
       </div>
     );
diff --git a/public/sass/components/_slate_editor.scss b/public/sass/components/_slate_editor.scss
index 7608f071e78..9dfdb685466 100644
--- a/public/sass/components/_slate_editor.scss
+++ b/public/sass/components/_slate_editor.scss
@@ -19,6 +19,7 @@
   border: $panel-border;
   border-radius: $border-radius;
   transition: all 0.3s;
+  line-height: $input-line-height;
 }
 
 .slate-query-field__wrapper--disabled {