diff --git a/themes/grav/js/mdeditor.js b/themes/grav/js/mdeditor.js
index db4c1d5c..b10ada41 100644
--- a/themes/grav/js/mdeditor.js
+++ b/themes/grav/js/mdeditor.js
@@ -98,7 +98,7 @@
                     '<div class="grav-mdeditor-navbar-flip">',
                         '<ul class="grav-mdeditor-navbar-nav">'];
 
-        if (!$this.element.data('grav-preview-disabled')) {
+        if ($this.element.data('grav-preview-enabled')) {
             template.push('<li class="grav-mdeditor-button-code mdeditor-active"><a>{:lblCodeview}</a></li>');
             template.push('<li class="grav-mdeditor-button-preview"><a>{:lblPreview}</a></li>');
         }
diff --git a/themes/grav/templates/forms/fields/markdown/markdown.html.twig b/themes/grav/templates/forms/fields/markdown/markdown.html.twig
index 4d530eb7..eb37954e 100644
--- a/themes/grav/templates/forms/fields/markdown/markdown.html.twig
+++ b/themes/grav/templates/forms/fields/markdown/markdown.html.twig
@@ -9,7 +9,7 @@
 {% block field %}
     <div class="form-field">
         <div class="form-data form-markdown-wrapper cm-s-paper">
-            <textarea data-grav-mdeditor="{{ { 'markdown': true }|json_encode|e('html_attr') }}" name="{{ (scope ~ field.name)|fieldName }}" {% if field.hidePreview %}data-grav-preview-disabled="true"{% endif %} data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json">{{ value|join("\n")|e('html') }}</textarea>
+            <textarea data-grav-mdeditor="{{ { 'markdown': true }|json_encode|e('html_attr') }}" name="{{ (scope ~ field.name)|fieldName }}" {% if field.showPreview %}data-grav-preview-enabled="true"{% endif %} data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json">{{ value|join("\n")|e('html') }}</textarea>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file