diff --git a/nodequeue.module b/nodequeue.module
index b382492..b63c219 100644
--- a/nodequeue.module
+++ b/nodequeue.module
@@ -2396,13 +2396,14 @@ function theme_nodequeue_arrange_subqueue_form_table($variables) {
 
     $counter++;
   }
-  if (empty($rows)) {
-    $rows[] = array(array('data' => t('No nodes in this queue.'), 'colspan' => 7));
-  }
 
   // Render the main nodequeue table.
   $header = array(t('Title'), t('Author'), t('Post Date'), t('Position'), array('data' => t('Operations'), 'colspan' => 2), t('Position'));
 
+  if (empty($rows)) {
+    $rows[] = array(array('data' => t('No nodes in this queue.'), 'colspan' => count($header) + 1));
+  }
+
   if (!empty($show_image)) {
     $header = array_merge(array(t('Image')), $header);
   }