diff --git a/ChangeLog b/ChangeLog
index 9ae6a2bfc1..dd58adab40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
 - issue        Added description for the _nopad (NO PAD) collation suffix
 - issue #15404 Remove array/string curly braces access
 - issue #15427 Fixed "FilterLanguages" option does not work (configuration)
+- issue #15127 Fix remove the white square in floating menubar when reloading the designer
 
 4.9.0.1 (2019-06-04)
 - issue #14478 phpMyAdmin no longer streams the export data
diff --git a/js/navigation.js b/js/navigation.js
index 5c8e4c7932..635d7a0844 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1164,7 +1164,7 @@ Navigation.ResizeHandler = function () {
         var windowWidth = $(window).width();
         $('#pma_navigation').width(pos);
         $('body').css('margin-' + this.left, pos + 'px');
-        $('#floating_menubar, #pma_console')
+        $('#pma_console')
             .css('margin-' + this.left, (pos + resizerWidth) + 'px');
         $resizer.css(this.left, pos + 'px');
         if (pos === 0) {
diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 9aaff0ac17..8e36811624 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -434,7 +434,7 @@
             {% for one_column_name in columns_list %}
                 <option value="{{ one_column_name }}"
                     {{- loop.revindex0 == 0 ? ' selected="selected"' }}>
-                    {{ 'after %s'|trans|format(one_column_name|e) }}
+                    {{ 'after %s'|trans|format(one_column_name) }}
                 </option>
             {% endfor %}
         </select>