diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index 01c8d7f9d..bf725b499 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -98,7 +98,6 @@
 
             &.cp-dropdown-submenu {
                 left: 250px;
-                top: 100px;
             }
 
             &:hover {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 2cc3faf24..fb05acad3 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1559,7 +1559,7 @@ define([
         hide = function () {
             window.setTimeout(function () {
                 entry.closest('ul.cp-dropdown-content').hide();
-                entry.parents('.cp-dropdown-content').removeClass('cp-dropdown-has-submenu').hide();
+                entry.parents('.cp-dropdown-content').hide();
             }, 0);
         };
 
@@ -1633,6 +1633,10 @@ define([
                 if (mutation.attributeName !== 'style') { return; }
                 if ($innerblock[0].style.display === 'none') {
                     $button.attr('aria-expanded', 'false');
+                    if (config.$parentButton) {
+                        config.$parentButton.find('a')
+                            .toggleClass('cp-dropdown-element-active', false);
+                    }
                 }
             });
         });
@@ -1684,6 +1688,16 @@ define([
             var topPos = button.bottom;
             $button.attr('aria-expanded', 'true');
             $innerblock.css('bottom', '');
+            $innerblock.show();
+            if ($parentMenu) {
+                // keep parent open when recursive
+                $parentMenu.show();
+                if (config.$parentButton) {
+                    config.$parentButton.find('a')
+                        .toggleClass('cp-dropdown-element-active', true);
+                }
+            }
+
             if (config.noscroll) {
                 var h = $innerblock.outerHeight();
                 if ((topPos + h) > wh) {
@@ -1691,12 +1705,23 @@ define([
                 }
             } else if ($parentMenu) {
                 let max = $parentMenu.css('max-height');
-                $innerblock.css('max-height', max);
+                let css = {
+                    'max-height': max
+                };
+                if (config.$parentButton) {
+                    let pos = config.$parentButton.position();
+                    let diff = pos.top;
+                    css['margin-top'] = diff+'px';
+                    css['max-height'] = (parseFloat(max)-diff)+'px';
+                }
+                $innerblock.css(css);
+                if ($innerblock.height() < 50) {
+                    $innerblock.css('max-height', max);
+                    $innerblock.css('margin-top', '');
+                }
             } else {
                 $innerblock.css('max-height', Math.floor(wh - topPos - 1)+'px');
             }
-            $innerblock.show();
-            if ($parentMenu) { $parentMenu.show(); } // keep parent open when recursive
             $innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
             setTimeout(() => {
                 if (config.isSelect && value) {
@@ -1719,12 +1744,6 @@ define([
             var state = $innerblock.is(':visible');
             $('.cp-dropdown-content').hide();
 
-            /*var $c = $container.closest('.cp-toolbar-drawer-content');
-            $c.removeClass('cp-dropdown-visible');
-            if (!state) {
-                $c.addClass('cp-dropdown-visible');
-            }*/
-
             try {
                 $('iframe').each(function (idx, ifrw) {
                     $(ifrw).contents().find('.cp-dropdown-content').hide();
@@ -1859,6 +1878,13 @@ define([
             if (e.which === 27) { // Esc
                 e.preventDefault();
                 $value.mouseleave();
+                if ($container.find('.cp-dropdown-submenu:visible').length) {
+                    let $submenu = $container.find('.cp-dropdown-submenu:visible');
+                    if ($submenu[0] !== $innerblock[0]) {
+                        $submenu.hide();
+                        return;
+                    }
+                }
                 hide();
                 if ($parentMenu) { $button.closest('li').focus(); }
                 else { $button.focus(); }
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index a7638c04c..1d5943255 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -275,6 +275,7 @@ define([
         module.handleImagePaste(editor);
 
         var setMode = exp.setMode = function (mode, cb) {
+            if (!mode) { return; }
             exp.highlightMode = mode;
             if (mode === 'markdown') { mode = 'gfm'; }
             if (/text\/x/.test(mode)) {
@@ -294,7 +295,7 @@ define([
                 editor.setOption('mode', mode);
             }
             if (exp.$language) {
-                var name = exp.$language.find('a[data-value="' + mode + '"]').text() || undefined;
+                var name = exp.$language.$menu.find('a[data-value="' + mode + '"]').text() || undefined;
                 name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton;
                 exp.$language.setValue(mode, name);
                 exp.$language.find('span.cp-language-text').text(name);
@@ -376,7 +377,6 @@ define([
             var $block = exp.$language = UIElements.createDropdown(dropdownConfig);
             $block.find('button').attr('title', Messages.languageButtonTitle).hide();
             $block.prepend(h('span.cp-language-text', Messages.languageButton));
-            $block.find('span.cp-language-text').prepend('<i class="fa fa-chevron-right"></i>');
 
             var isHovering = false;
             var $aLanguages = $block.$menu.find('li');
@@ -386,7 +386,7 @@ define([
             });
             $aLanguages.mouseleave(function () {
                 if (isHovering) {
-                    setMode($block.find(".cp-dropdown-element-active").attr('data-value'));
+                    setMode($block.$menu.find(".cp-dropdown-element-active").attr('data-value'));
                 }
             });
             //$aLanguages.click(function () {
@@ -406,6 +406,7 @@ define([
                         $block.find('button').click();
                     },
                 });
+                dropdownConfig.$parentButton = $blockButton;
                 $drawer.append($blockButton);
             }
             if (exp.highlightMode) { exp.setMode(exp.highlightMode); }
@@ -482,6 +483,7 @@ define([
                             $block.find('button').click();
                         },
                     });
+                    dropdownConfig.$parentButton = $blockButton;
                     $drawer.append($blockButton);
                 }
                 if (cb) { cb(); }