diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index f914a5d89..1ddedcebd 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -311,7 +311,14 @@ define([
                 common: Common
             };
             var $block = exp.$language = UIElements.createDropdown(dropdownConfig);
-            $block.find('button').attr('title', Messages.languageButtonTitle);
+            $block.find('button').attr('title', Messages.languageButtonTitle).click(function () {
+                var state = $block.find('.cp-dropdown-content').is(':visible');
+                var $c = $block.closest('.cp-toolbar-drawer-content');
+                $c.removeClass('cp-dropdown-visible');
+                if (!state) {
+                    $c.addClass('cp-dropdown-visible');
+                }
+            });
 
             var isHovering = false;
             var $aLanguages = $block.find('a');