diff --git a/src/Element/WebformHtmlEditor.php b/src/Element/WebformHtmlEditor.php
index 9adeda16..f85a4ef4 100644
--- a/src/Element/WebformHtmlEditor.php
+++ b/src/Element/WebformHtmlEditor.php
@@ -72,8 +72,9 @@ class WebformHtmlEditor extends FormElement {
       $element['value']['#required'] = $element['#required'];
     }
 
-    // If HTML disabled return simple CodeMirror HTML editor.
-    $disabled = \Drupal::config('webform.settings')->get('html_editor.disabled') ?: $element['#format'];
+    // If HTML disabled and no #format is specified return simple CodeMirror
+    // HTML editor.
+    $disabled = \Drupal::config('webform.settings')->get('html_editor.disabled') ?: ($element['#format'] ===  FALSE);
     if ($disabled) {
       $element['value'] += [
         '#type' => 'webform_codemirror',
@@ -83,8 +84,9 @@ class WebformHtmlEditor extends FormElement {
       return $element;
     }
 
-    // If #context and format is defined return 'text_format' element.
-    $format = \Drupal::config('webform.settings')->get('html_editor.format') ?: $element['#format'];
+    // If #format or 'webform.settings.html_editor.format' is defined return
+    // a 'text_format' element.
+    $format = $element['#format'] ?: \Drupal::config('webform.settings')->get('html_editor.format');
     if ($format) {
       $element['value'] += [
         '#type' => 'text_format',
diff --git a/src/Form/WebformHandlerFormBase.php b/src/Form/WebformHandlerFormBase.php
index 1d974b95..8122a302 100644
--- a/src/Form/WebformHandlerFormBase.php
+++ b/src/Form/WebformHandlerFormBase.php
@@ -84,6 +84,12 @@ abstract class WebformHandlerFormBase extends FormBase {
       }
     }
 
+    // Add meta data to webform handler form.
+    // This information makes it a little easier to alter a handler's form.
+    $form['#webform_id']  = $this->webform->id();
+    $form['#webform_handler_id'] = $this->webformHandler->getHandlerId();
+    $form['#webform_handler_plugin_id'] = $this->webformHandler->getPluginId();
+
     $request = $this->getRequest();
 
     $form['description'] = [
diff --git a/src/Tests/Element/WebformElementHtmlEditorTest.php b/src/Tests/Element/WebformElementHtmlEditorTest.php
index 6e2b85a7..2b84cfb5 100644
--- a/src/Tests/Element/WebformElementHtmlEditorTest.php
+++ b/src/Tests/Element/WebformElementHtmlEditorTest.php
@@ -42,10 +42,14 @@ class WebformElementHtmlEditorTest extends WebformTestBase {
   public function testHtmlEditor() {
     $this->drupalLogin($this->rootUser);
 
-    // Check that HTML editor is enabled.
     $this->drupalGet('webform/test_element_html_editor');
+
+    // Check that HTML editor is enabled.
     $this->assertRaw('<textarea class="js-html-editor form-textarea resize-vertical" data-drupal-selector="edit-webform-html-editor-value" id="edit-webform-html-editor-value" name="webform_html_editor[value]" rows="5" cols="60">Hello &lt;b&gt;World!!!&lt;/b&gt;</textarea>');
 
+    // Check that CodeMirror is displayed when #format: FALSE.
+    $this->assertRaw('<textarea data-drupal-selector="edit-webform-html-editor-codemirror-value" class="js-webform-codemirror webform-codemirror html form-textarea resize-vertical" data-webform-codemirror-mode="text/html" id="edit-webform-html-editor-codemirror-value" name="webform_html_editor_codemirror[value]" rows="5" cols="60">Hello &lt;b&gt;World!!!&lt;/b&gt;</textarea>');
+
     // Disable HTML editor.
     $this->drupalPostForm('admin/structure/webform/config/elements', ['html_editor[disabled]' => TRUE], t('Save configuration'));
 
diff --git a/tests/modules/webform_test/config/install/webform.webform.test_element_html_editor.yml b/tests/modules/webform_test/config/install/webform.webform.test_element_html_editor.yml
index 4b564ff7..312e2be7 100644
--- a/tests/modules/webform_test/config/install/webform.webform.test_element_html_editor.yml
+++ b/tests/modules/webform_test/config/install/webform.webform.test_element_html_editor.yml
@@ -27,6 +27,11 @@ elements: |
     '#title': 'webform_html_editor (format)'
     '#default_value': 'Hello <b>World!!!</b>'
     '#format': 'basic_html'
+  webform_html_editor_codemirror:
+    '#type': webform_html_editor
+    '#title': 'webform_html_editor_codemirror (none)'
+    '#default_value': 'Hello <b>World!!!</b>'
+    '#format': false
 css: ''
 javascript: ''
 settings: