diff --git a/includes/views/nodequeue.views.inc b/includes/views/nodequeue.views.inc
index 42c1291..8de2f14 100644
--- a/includes/views/nodequeue.views.inc
+++ b/includes/views/nodequeue.views.inc
@@ -294,92 +294,3 @@ function nodequeue_views_data_alter(&$data) {
     ),
   );
 }
-
-
-
-/**
- * Implements hook_contextual_links_view_alter().
- */
-function nodequeue_contextual_links_view_alter(&$element, $items) {
-
-  // Bail if the user doesn't have access to edit nodequeues.
-  if (!user_access('manipulate queues')) {
-    return;
-  }
-
-  if (empty($element['#element']['#contextual_links']['views_ui'])) {
-    return;
-  }
-
-  if (!variable_get('nodequeue_show_contextual_links', TRUE)) {
-    return;
-  }
-
-  // If this is a block placed by Context then the View info is stored in
-  // a slightly different place
-  $views_info = empty($element['#element']['#views_contextual_links_info'])
-    ? $element['#element']['content']['#views_contextual_links_info']
-    : $element['#element']['#views_contextual_links_info'];
-
-  $display_id = $views_info['views_ui']['view_display_id'];
-  $view_name = $views_info['views_ui']['view_name'];
-  $view = views_get_view($view_name, TRUE);
-
-  // If the view is empty, e.g. it wasn't saved yet and has no display
-  // objects, this won't work.
-  if (empty($view)) {
-    return;
-  }
-  $view->build($display_id);
-
-  $nodequeue_rels = array(
-    'nodequeue_handler_relationship_nodequeue'
-  );
-  $subqueue_arg_titles = array(
-    'Subqueue reference',
-    'Subqueue reference (optional)',
-  );
-
-  // Cycle through all the relationships to find ones provided by nodequeue.
-  // We'll use this as a trigger to attach the links.
-  foreach ($view->relationship as $rel) {
-    if (!in_array(get_class($rel), $nodequeue_rels, TRUE)) {
-      continue;
-    }
-
-    foreach ($rel->options['names'] as $queue_name) {
-      if (gettype($queue_name) != 'string') {
-        continue;
-      }
-      $qid_map = nodequeue_get_qid_map();
-      $qid = $qid_map[$queue_name];
-      $queue = nodequeue_load($qid);
-      $element['#links'][$queue_name] = array(
-        'title' => t('Edit queue'),
-        'href' => 'admin/structure/nodequeue/' . $qid . '/view',
-        'query' => array('destination' => current_path()),
-      );
-
-      // Cycle through all arguments to find ones that limit us by subqueue.
-      // If we find some, add further links to subqueues.
-      foreach ($view->argument as $arg) {
-        $is_subqueue_arg = $arg->options['relationship'] == $rel->options['id']
-          && in_array($arg->definition['title'], $subqueue_arg_titles, TRUE);
-
-        if (!$is_subqueue_arg) {
-          continue;
-        }
-
-        // Provide contextual links for each of the subqueues.
-        $subqueues = nodequeue_load_subqueues_by_reference(array($qid => $arg->value));
-        foreach ($subqueues as $sqid => $subqueue) {
-          $element['#links'][$queue_name . '_' . $sqid] = array(
-            'title' => t('Edit Subqueue'),
-            'href' => 'admin/structure/nodequeue/' . $qid . '/view/' . $sqid,
-            'query' => array('destination' => current_path()),
-          );
-        }
-      }
-    }
-  }
-}
diff --git a/nodequeue.module b/nodequeue.module
index fc3dbbb..3d5be45 100644
--- a/nodequeue.module
+++ b/nodequeue.module
@@ -327,6 +327,91 @@ function position_value(&$form) {
 }
 
 /**
+ * Implements hook_contextual_links_view_alter().
+ */
+function nodequeue_contextual_links_view_alter(&$element, $items) {
+  // Bail if the user doesn't have access to edit nodequeues.
+  if (!user_access('manipulate queues')) {
+    return;
+  }
+
+  if (empty($element['#element']['#contextual_links']['views_ui'])) {
+    return;
+  }
+
+  if (!variable_get('nodequeue_show_contextual_links', TRUE)) {
+    return;
+  }
+
+  // If this is a block placed by context then the view info is stored in a
+  // slightly different place.
+  $views_info = empty($element['#element']['#views_contextual_links_info'])
+    ? $element['#element']['content']['#views_contextual_links_info']
+    : $element['#element']['#views_contextual_links_info'];
+
+  $display_id = $views_info['views_ui']['view_display_id'];
+  $view_name = $views_info['views_ui']['view_name'];
+  $view = views_get_view($view_name, TRUE);
+
+  // If the view is empty, e.g. it wasn't saved yet and has no display objects,
+  // this won't work.
+  if (empty($view)) {
+    return;
+  }
+  $view->build($display_id);
+
+  $nodequeue_rels = array(
+    'nodequeue_handler_relationship_nodequeue'
+  );
+  $subqueue_arg_titles = array(
+    'Subqueue reference',
+    'Subqueue reference (optional)',
+  );
+
+  // Cycle through all the relationships to find ones provided by nodequeue.
+  // We'll use this as a trigger to attach the links.
+  foreach ($view->relationship as $rel) {
+    if (!in_array(get_class($rel), $nodequeue_rels, TRUE)) {
+      continue;
+    }
+
+    foreach ($rel->options['names'] as $queue_name) {
+      if (gettype($queue_name) != 'string') {
+        continue;
+      }
+      $qid_map = nodequeue_get_qid_map();
+      $qid = $qid_map[$queue_name];
+      $queue = nodequeue_load($qid);
+      $element['#links'][$queue_name] = array(
+        'title' => t('Edit queue'),
+        'href' => 'admin/structure/nodequeue/' . $qid . '/view',
+        'query' => array('destination' => current_path()),
+      );
+
+      // Cycle through all arguments to find ones that limit us by subqueue.
+      // If we find some, add further links to subqueues.
+      foreach ($view->argument as $arg) {
+        $is_subqueue_arg = $arg->options['relationship'] == $rel->options['id'] && in_array($arg->definition['title'], $subqueue_arg_titles, TRUE);
+
+        if (!$is_subqueue_arg) {
+          continue;
+        }
+
+        // Provide contextual links for each of the subqueues.
+        $subqueues = nodequeue_load_subqueues_by_reference(array($qid => $arg->value));
+        foreach ($subqueues as $sqid => $subqueue) {
+          $element['#links'][$queue_name . '_' . $sqid] = array(
+            'title' => t('Edit Subqueue'),
+            'href' => 'admin/structure/nodequeue/' . $qid . '/view/' . $sqid,
+            'query' => array('destination' => current_path()),
+          );
+        }
+      }
+    }
+  }
+}
+
+/**
  * Implements hook_views_api().
  */
 function nodequeue_views_api() {