diff --git a/public/assets/css/base_mid.css b/public/assets/css/base_mid.css
index 7f791ed144..c0402cb990 100644
--- a/public/assets/css/base_mid.css
+++ b/public/assets/css/base_mid.css
@@ -158,4 +158,13 @@ b {
       stroke: currentColor;
       fill: currentColor;
       align-self: center;
+}
+
+/* left panel z-index fix */
+.form {
+      position: relative;
+      z-index: 0;
+}
+#header {
+      z-index: 1;
 }
\ No newline at end of file
diff --git a/public/assets/css/base_small.css b/public/assets/css/base_small.css
index 0a9bab19f4..ca7c52ff3c 100644
--- a/public/assets/css/base_small.css
+++ b/public/assets/css/base_small.css
@@ -153,4 +153,13 @@ b {
       stroke-width: 0;
       stroke: currentColor;
       fill: currentColor;
+}
+
+/* left panel z-index fix */
+.form {
+      position: relative;
+      z-index: 0;
+}
+#header {
+      z-index: 1;
 }
\ No newline at end of file
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 8f1b0a8a8c..ab695abf52 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -72,7 +72,7 @@
 
             {% block nav %}{% endblock %}
             {% block body %}{% endblock %}
-            {% block javascripts %}{% endblock %}
+            {% block javascripts %}{% endblock javascripts%}
       </div>
       </body>
 </html>
diff --git a/templates/settings/avatar.html.twig b/templates/settings/avatar.html.twig
index 29f5915d6a..9c0a250764 100644
--- a/templates/settings/avatar.html.twig
+++ b/templates/settings/avatar.html.twig
@@ -23,4 +23,4 @@
 
 {% block javascripts %}
       <script type="text/javascript" src="{{ asset('assets/javascript/cropping.js') }}"></script>
-{% endblock %}
+{% endblock javascripts %}