diff --git a/core/modules/tour/js/tour.js b/core/modules/tour/js/tour.js
index fde4f58d4d1d..86ad8a24dd04 100644
--- a/core/modules/tour/js/tour.js
+++ b/core/modules/tour/js/tour.js
@@ -177,7 +177,8 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({
         var $this = $(this);
         var itemId = $this.attr('data-id');
         var itemClass = $this.attr('data-class');
-        if ((itemId && $document.find('#' + itemId).length) ||
+        if ((!itemId && !itemClass) ||
+           (itemId && $document.find('#' + itemId).length) ||
            (itemClass && $document.find('.' + itemClass).length)){
           return;
         }