diff --git a/www/form/app-form.less b/www/form/app-form.less
index 81309c2f6..e092ed67c 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -431,6 +431,24 @@
                     }
                 }
 
+                .cp-editor-wrapper {
+                    .cp-markdown-toggle-row {
+                        margin: 0.5rem 0;
+                        position: relative;
+                        .cp-markdown-toolbar-toggle-button {
+                            padding: 3px 10px;
+                            height: 32px;
+                            margin: 0;
+                            line-height: 1;
+                            border-radius: @variables_radius;
+                            display: inline-flex;
+                        }
+                        .cp-markdown-toolbar-toggle-button i.fa {
+                            margin: 0 !important;
+                        }
+                    }
+                }
+
                 .cp-form-creator-add-inline {
                     display: flex;
                     flex-flow: row;
diff --git a/www/form/inner.js b/www/form/inner.js
index 5543433ac..abb0a8878 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1125,8 +1125,17 @@ define([
                                     editor.replaceSelection($(mt)[0].outerHTML);
                                 }
                             });
+                            var toggleRow = h('div.cp-markdown-toggle-row');
                             $(block).prepend(markdownTb.toolbar);
-                            $(markdownTb.toolbar).show();
+                            if(Util.isSmallScreen()) {
+                                var toggleButton = UIElements.createMarkdownToolbarToggle(markdownTb.toolbar, editor);
+                                $(toggleRow).append(toggleButton);
+                                $(markdownTb.toolbar).hide();
+                            }
+                            else {
+                                $(markdownTb.toolbar).show();
+                            }
+                            $(block).prepend(toggleRow);
                             cm.configureTheme(APP.common, function () {});
                         }
 
@@ -1159,8 +1168,14 @@ define([
                             };
                         };
 
+                        var outerWrapper = h('div.cp-editor-wrapper', [
+                            toggleRow,
+                            block
+                        ]);
+                        
+
                         return [
-                            block,
+                            outerWrapper,
                             cancelBlock
                         ];
                     },
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index b08f1f56c..4e909c07b 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -120,11 +120,11 @@
         }
         margin-bottom: 5px;
     }
-    .markdown-label-row {
+    .cp-markdown-label-row {
         margin-bottom: 0.5rem;
         position: relative;
     }
-    .markdown-label-row label {
+    .cp-markdown-label-row label {
         display: inline-block;
         margin: 0;
         vertical-align: middle;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 9149bf8d1..656cb72f1 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -213,7 +213,7 @@ define([
             commit();
         });
 
-        var markdownEditorWrapper = h('div.markdown-label-row', [
+        var markdownEditorWrapper = h('div.cp-markdown-label-row', [
             h('label', { for: 'cp-kanban-edit-body' }, Messages.kanban_body)
         ]);