diff --git a/www/common/common-codemirror.js b/www/common/common-codemirror.js
index ae5e1e8f6..ca53b8887 100644
--- a/www/common/common-codemirror.js
+++ b/www/common/common-codemirror.js
@@ -53,7 +53,7 @@ define([
             if (exp.$language) {
                 var name = exp.$language.find('a[data-value="' + mode + '"]').text() || undefined;
                 name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton;
-                exp.$language.setValue(name);
+                exp.$language.setValue(mode, name);
             }
             if(cb) { cb(mode); }
         };
@@ -86,7 +86,7 @@ define([
                 if ($select) {
                     var name = theme || undefined;
                     name = name ? Messages.themeButton + ' ('+theme+')' : Messages.themeButton;
-                    $select.setValue(name);
+                    $select.setValue(theme, name);
                 }
             };
         }());
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index d28a91c50..d90cb327d 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1197,10 +1197,10 @@ define([
                 }, 1000);
             });
 
-            $container.setValue = function (val) {
+            $container.setValue = function (val, name) {
                 value = val;
                 var $val = $innerblock.find('[data-value="'+val+'"]');
-                var textValue = $val.html() || val;
+                var textValue = name || $val.html() || val;
                 $button.find('.buttonTitle').html(textValue);
             };
             $container.getValue = function () {