--- old/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java	2018-04-17 18:01:30.784422000 +0530
+++ new/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java	2018-04-17 18:01:29.727422000 +0530
@@ -306,7 +306,9 @@
                         executeCommand(INDENT.getCommand(), null);
                     }
                     else {
+                        setDesignMode("on");
                         executeCommand(INSERT_TAB.getCommand(), null);
+                        setDesignMode("off");
                     }
                 }
                 else {
@@ -448,7 +450,6 @@
             if (newValue.doubleValue() == totalWork) {
                 cachedHTMLText = null;
                 Platform.runLater(() -> {
-                    setDesignMode("on");
                     setContentEditable(true);
                     updateToolbarState(true);
                     updateNodeOrientation();