diff --git a/ui/src/editor-core/toolbar.js b/ui/src/editor-core/toolbar.js
index e929846909..88be6eaa1b 100644
--- a/ui/src/editor-core/toolbar.js
+++ b/ui/src/editor-core/toolbar.js
@@ -1735,7 +1735,8 @@ Toolbar.prototype.mediaContentPopulate = function(menu) {
 
       if (
         (!res.data || res.data.length == 0) &&
-        $mediaContent.find('.toolbar-card').length == 0
+        $mediaContent.find('.toolbar-card:not(.toolbar-card-special)')
+          .length == 0
       ) {
         // Handle card behaviour
         self.handleCardsBehaviour();
@@ -2443,7 +2444,9 @@ Toolbar.prototype.layoutTemplatesContentPopulate = function(menu) {
         } else if (response.login) {
           window.location.href = window.location.href;
           location.reload();
-        } else if ($content.find('.toolbar-card').length === 0) {
+        } else if (
+          $content.find('.toolbar-card:not(.toolbar-card-special)').length === 0
+        ) {
           $searchForm.append(
             '<div class="no-results-message">' +
             toolbarTrans.noMediaToShow +
@@ -2648,10 +2651,14 @@ Toolbar.prototype.playlistsContentPopulate = function(menu) {
         } else if (response.login) {
           window.location.href = window.location.href;
           location.reload();
-        } else if ($content.find('.toolbar-card').length === 0) {
+        } else if (
+          $content.find('.toolbar-card:not(.toolbar-card-special)').length === 0
+        ) {
+          self.handleCardsBehaviour();
+
           $searchForm.append(
             '<div class="no-results-message">' +
-            toolbarTrans.noMediaToShow +
+            toolbarTrans.noPlaylistsToShow +
             '</div>');
         }
 
diff --git a/ui/src/templates/toolbar-card-media-upload.hbs b/ui/src/templates/toolbar-card-media-upload.hbs
index accf16552f..d7817644ba 100644
--- a/ui/src/templates/toolbar-card-media-upload.hbs
+++ b/ui/src/templates/toolbar-card-media-upload.hbs
@@ -1,4 +1,4 @@
-<div class="toolbar-card upload-card"
+<div class="toolbar-card upload-card toolbar-card-special"
     data-toggle="tooltip" 
     data-type="widget" 
     data-sub-type="{{type}}"
diff --git a/ui/src/templates/toolbar-card-playlist-new-template.hbs b/ui/src/templates/toolbar-card-playlist-new-template.hbs
index 3f9d8ff41b..a1faeb3f06 100644
--- a/ui/src/templates/toolbar-card-playlist-new-template.hbs
+++ b/ui/src/templates/toolbar-card-playlist-new-template.hbs
@@ -1,4 +1,4 @@
-<div class="toolbar-card new-playlist-card"
+<div class="toolbar-card new-playlist-card toolbar-card-special"
     data-toggle="tooltip" 
     data-type="widgets" 
     data-sub-type="{{#if editingPlaylist}}subplaylist{{else}}playlist{{/if}}"
diff --git a/views/common.twig b/views/common.twig
index 1e359bf780..821bdd8f3e 100644
--- a/views/common.twig
+++ b/views/common.twig
@@ -746,6 +746,7 @@
                 noActionsToShow: "{{ "No actions to display" |trans }}",
                 noTemplatesToShow: "{{ "No templates to display"|trans }}",
                 noMediaToShow: "{{ "No media to display!" |trans }}",
+                noPlaylistsToShow: "{{ "No playlists to display!" |trans }}",
                 showMore: "{{ "Show more" |trans }}",
                 noShowMore: "{{ "No more results for this filter!" |trans }}",
                 mediaPreview: {