diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 8b7c9d74..42f5b982 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -749,7 +749,8 @@ Callbacks = {
                 $("#queue").scrollTop(0);
                 var scroll = li.position().top - $("#queue").position().top;
                 $("#queue").scrollTop(scroll);
-            }
+            },
+            can_wait: true
         });
     },
 
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 4ebeada0..fbcb4cb6 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -980,7 +980,9 @@ function queueAction(data) {
         if(!("expire" in data))
             data.expire = Date.now() + 5000;
         if(!data.fn()) {
-            if(Date.now() < data.expire)
+            if(data.can_wait && Date.now() < data.expire)
+                PL_QUEUED_ACTIONS.push(data);
+            else if(Date.now() < data.expire)
                 PL_QUEUED_ACTIONS.unshift(data);
         }
         if(PL_QUEUED_ACTIONS.length == 0) {