diff --git a/app/ui/components/codemirror/Editor.js b/app/ui/components/codemirror/Editor.js
index cf1848d566..a4e2be075e 100644
--- a/app/ui/components/codemirror/Editor.js
+++ b/app/ui/components/codemirror/Editor.js
@@ -575,7 +575,7 @@ class Editor extends PureComponent {
   }
 
   render () {
-    const {readOnly, fontSize, mode, filter} = this.props;
+    const {readOnly, fontSize, mode, filter, onMouseLeave} = this.props;
 
     const classes = classnames(
       'editor',
@@ -634,7 +634,7 @@ class Editor extends PureComponent {
 
     return (
       <div className={classes}>
-        <div className="editor__container input" style={styles}>
+        <div className="editor__container input" style={styles} onMouseLeave={onMouseLeave}>
           <textarea
             ref={this._handleInitTextarea}
             style={{display: 'none'}}
@@ -654,6 +654,7 @@ Editor.propTypes = {
   onFocus: PropTypes.func,
   onBlur: PropTypes.func,
   onClickLink: PropTypes.func,
+  onMouseLeave: PropTypes.func,
   render: PropTypes.func,
   keyMap: PropTypes.string,
   mode: PropTypes.string,
diff --git a/app/ui/components/codemirror/OneLineEditor.js b/app/ui/components/codemirror/OneLineEditor.js
index 32780267c7..b9664f9e28 100644
--- a/app/ui/components/codemirror/OneLineEditor.js
+++ b/app/ui/components/codemirror/OneLineEditor.js
@@ -13,14 +13,13 @@ class OneLineEditor extends PureComponent {
   constructor (props) {
     super(props);
 
-    let mode = MODE_INPUT;
-
-    if (props.forceInput) {
-      mode = MODE_INPUT;
-    } else if (props.forceEditor) {
+    let mode;
+    if (props.forceEditor) {
       mode = MODE_EDITOR;
     } else if (this._mayContainNunjucks(props.defaultValue)) {
       mode = MODE_EDITOR;
+    } else {
+      mode = MODE_INPUT;
     }
 
     this.state = {mode};
@@ -38,7 +37,9 @@ class OneLineEditor extends PureComponent {
 
   focusEnd () {
     if (this.state.mode === MODE_EDITOR) {
-      this._editor.focusEnd();
+      if (!this._editor.hasFocus()) {
+        this._editor.focusEnd();
+      }
     } else {
       this._input.focus();
       this._input.value = this._input.value + '';
@@ -85,24 +86,7 @@ class OneLineEditor extends PureComponent {
   }
 
   _handleInputChange (value) {
-    if (!this.props.forceInput && this._mayContainNunjucks(value)) {
-      const start = this._input.getSelectionStart();
-      const end = this._input.getSelectionEnd();
-
-      // Wait for the editor to swap and restore cursor position
-      const check = () => {
-        if (this._editor) {
-          this._editor.setSelection(start, end);
-        } else {
-          setTimeout(check, 40);
-        }
-      };
-
-      // Tell the component to show the editor
-      this.setState({mode: MODE_EDITOR});
-      check();
-    }
-
+    this._convertToEditorAndFocus();
     this.props.onChange && this.props.onChange(value);
   }
 
@@ -121,11 +105,7 @@ class OneLineEditor extends PureComponent {
       return;
     }
 
-    if (this._mayContainNunjucks(this.getValue())) {
-      return;
-    }
-
-    this.setState({mode: MODE_INPUT});
+    this._convertToInputIfNotFocused();
   }
 
   _handleEditorKeyDown (e) {
@@ -145,6 +125,54 @@ class OneLineEditor extends PureComponent {
     this.props.onKeyDown && this.props.onKeyDown(e, this.getValue());
   }
 
+  _convertToEditorAndFocus () {
+    if (this.state.mode !== MODE_INPUT) {
+      return;
+    }
+
+    const start = this._input.getSelectionStart();
+    const end = this._input.getSelectionEnd();
+
+    // Wait for the editor to swap and restore cursor position
+    const check = () => {
+      if (this._editor) {
+        this._editor.setSelection(start, end);
+      } else {
+        setTimeout(check, 40);
+      }
+    };
+
+    // Tell the component to show the editor
+    check();
+    this._convertToEditor();
+  }
+
+  _convertToEditor () {
+    if (this.state.mode === MODE_EDITOR) {
+      return;
+    }
+
+    if (this.state.mode !== MODE_EDITOR) {
+      this.setState({mode: MODE_EDITOR});
+    }
+  }
+
+  _convertToInputIfNotFocused () {
+    if (this.state.mode === MODE_INPUT || this.props.forceEditor) {
+      return;
+    }
+
+    if (this._editor.hasFocus()) {
+      return;
+    }
+
+    if (this._mayContainNunjucks(this.getValue())) {
+      return;
+    }
+
+    this.setState({mode: MODE_INPUT});
+  }
+
   _setEditorRef (n) {
     this._editor = n;
   }
@@ -190,6 +218,7 @@ class OneLineEditor extends PureComponent {
           onBlur={this._handleEditorBlur}
           onKeyDown={this._handleEditorKeyDown}
           onFocus={this._handleEditorFocus}
+          onMouseLeave={this._convertToInputIfNotFocused}
           onChange={onChange}
           render={render}
           className="editor--single-line"
@@ -203,10 +232,14 @@ class OneLineEditor extends PureComponent {
           ref={this._setInputRef}
           type={type}
           className={'editor--single-line input ' + className || ''}
-          style={{padding: '0 4px', width: '100%'}} // To match CodeMirror
+          style={{
+            padding: '0 4px', // To match CodeMirror
+            width: '100%'
+          }}
           placeholder={placeholder}
           defaultValue={defaultValue}
           onChange={this._handleInputChange}
+          onMouseEnter={this._convertToEditor}
           onBlur={onBlur}
           onFocus={this._handleInputFocus}
           onKeyDown={this._handleInputKeyDown}
@@ -228,8 +261,7 @@ OneLineEditor.propTypes = Object.assign({}, Editor.propTypes, {
   render: PropTypes.func,
   placeholder: PropTypes.string,
   blurOnFocus: PropTypes.bool,
-  forceEditor: PropTypes.bool,
-  forceInput: PropTypes.bool
+  forceEditor: PropTypes.bool
 });
 
 export default OneLineEditor;
diff --git a/app/ui/components/codemirror/extensions/nunjucks-tags.js b/app/ui/components/codemirror/extensions/nunjucks-tags.js
index 5930563178..eec2ab2e7d 100644
--- a/app/ui/components/codemirror/extensions/nunjucks-tags.js
+++ b/app/ui/components/codemirror/extensions/nunjucks-tags.js
@@ -176,7 +176,7 @@ async function _highlightNunjucksTags (render) {
   }
 }
 
-async function _updateElementText (render, el, text, preview = false) {
+async function _updateElementText (render, el, text) {
   try {
     const str = text.replace(/\\/g, '');
     const tagMatch = str.match(/{% *([^ ]+) *.*%}/);
@@ -187,42 +187,34 @@ async function _updateElementText (render, el, text, preview = false) {
       .replace(/}}$/, '')
       .trim();
 
-    let innerHTML = '';
-
     if (tagMatch) {
       const tag = tagMatch[1];
 
       // Don't render other tags because they may be two-parters
       // eg. {% for %}...{% endfor %}
       const cleaned = cleanedStr.replace(tag, '').trim();
-      innerHTML = `<label>${tag}</label> ${cleaned}`.trim();
+      el.innerHTML = `<label>${tag}</label> ${cleaned}`.trim();
 
       if (['response', 'res', 'uuid', 'timestamp', 'now'].includes(tag)) {
         // Try rendering these so we can show errors if needed
         const v = await render(str);
         el.title = v;
-        innerHTML = preview ? v : innerHTML;
       } else {
         el.setAttribute('data-ignore', 'on');
       }
     } else {
       // Render if it's a variable
+      el.innerHTML = `<label>var</label> ${cleanedStr}`.trim();
       const v = await render(str);
       el.title = v;
-      innerHTML = preview ? v : `${cleanedStr}`.trim();
     }
 
-    el.innerHTML = innerHTML;
     el.setAttribute('data-error', 'off');
   } catch (err) {
     const fullMessage = err.message.replace(/\[.+,.+]\s*/, '');
     let message = fullMessage;
-    if (message.length > 16) {
-      message = `${message.slice(0, 15)}&hellip;`;
-    }
-    el.innerHTML = `&#x203c; ${message}`;
+    el.title = message;
     el.className += ' nunjucks-widget--error';
     el.setAttribute('data-error', 'on');
-    el.title = fullMessage;
   }
 }