diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index e4996bc..6736505 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -390,7 +390,7 @@ function theme_toolbar_tab_wrapper(&$variables) {
  *     #attributes.
  */
 function theme_toolbar_tray_wrapper(&$variables) {
-  if (!empty($variables['element']['#children'])) {
+  if (!empty($variables['element']['#children']) && strip_tags($variables['element']['#children']) != "") {
     $element = $variables['element'];
     return '<div' . new Attribute($element['#wrapper_attributes']) . '><div class="lining clearfix">' . $element['#children'] . '</div></div>';
   }
@@ -405,7 +405,7 @@ function theme_toolbar_tray_wrapper(&$variables) {
  *     the tray. Properties used: #children and #heading.
  */
 function theme_toolbar_tray_heading_wrapper(&$variables) {
-  if (!empty($variables['element']['#children'])) {
+  if (!empty($variables['element']['#children']) && strip_tags($variables['element']['#children']) != "") {
     $element = $variables['element'];
     return '<h3 class="element-invisible">' . $element['#heading'] . '</h3>' . $element['#children'];
   }