diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index 7e04019..714f94e 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -124,7 +124,7 @@
       var orientation = this.model.get('orientation');
       // Determine the toggle-to orientation.
       var antiOrientation = (orientation === 'vertical') ? 'horizontal' : 'vertical';
-      var locked = (antiOrientation === 'vertical') ? true : false;
+      var locked = (antiOrientation === 'vertical');
       // Remember the locked state.
       if (locked) {
         localStorage.setItem('Drupal.toolbar.trayVerticalLocked', 'true');
diff --git a/core/modules/toolbar/templates/menu--toolbar.html.twig b/core/modules/toolbar/templates/menu--toolbar.html.twig
index 659e8f5..e7bf315 100644
--- a/core/modules/toolbar/templates/menu--toolbar.html.twig
+++ b/core/modules/toolbar/templates/menu--toolbar.html.twig
@@ -54,4 +54,4 @@
     {% endfor %}
     </ul>
   {% endif %}
-{% endmacro %}
+{% endmacro %}
\ No newline at end of file
diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig
index cb82774..fa53534 100644
--- a/core/modules/toolbar/templates/toolbar.html.twig
+++ b/core/modules/toolbar/templates/toolbar.html.twig
@@ -34,15 +34,15 @@
             {% if tray.label %}
               <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
                 <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+              </nav>
             {% else %}
-              <nav class="toolbar-lining clearfix" role="navigation">
+              <nav class="toolbar-lining clearfix" role="navigation"></nav>
             {% endif %}
             {{ tray.links }}
-            </nav>
           </div>
         {% endspaceless %}
       </div>
     {% endfor %}
   </nav>
   {{ remainder }}
-</div>
+</div>
\ No newline at end of file