diff --git a/core/modules/tour/js/tour.js b/core/modules/tour/js/tour.js
index 7e87417..00749d4 100644
--- a/core/modules/tour/js/tour.js
+++ b/core/modules/tour/js/tour.js
@@ -177,10 +177,12 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({
         var $this = $(this);
         var itemId = $this.attr('data-id');
         var itemClass = $this.attr('data-class');
-        if ((itemId || itemClass) && $document.find('#' + itemId + ', .' + itemClass).length === 0) {
-          removals = true;
-          $this.remove();
+        if ((itemId && $document.find('#' + itemId).length) ||
+           (itemClass && $document.find('.' + itemClass).length)){
+          return;
         }
+        removals = true;
+        $this.remove();
       });
 
     // If there were removals, we'll have to do some clean-up.