diff --git a/theme/views_slideshow.theme.inc b/theme/views_slideshow.theme.inc
index 095ec29..81fcd69 100644
--- a/theme/views_slideshow.theme.inc
+++ b/theme/views_slideshow.theme.inc
@@ -235,7 +235,7 @@ function _views_slideshow_preprocess_views_slideshow_pager_fields(&$vars) {
   // Render all the fields unless there is only 1 slide and the user specified
   // to hide them when there is only one slide.
   $vars['rendered_field_items'] = '';
-  if (empty($vars['settings']['views_slideshow_pager_fields_hide_on_single_slide']) && count($vars['view']->result) > 1) {
+  if (empty($vars['settings']['hide_on_single_slide']) && count($vars['view']->result) > 1) {
     foreach ($vars['view']->result as $count => $node) {
       $rendered_fields = '';
       foreach ($vars['settings']['views_slideshow_pager_fields_fields'] as $field => $use) {
@@ -281,7 +281,7 @@ function theme_views_slideshow_controls_widget_render($vars) {
   drupal_add_js($js_vars, 'setting');
 
   $output = '';
-  if (count($vars['rows']) > 1) {
+  if (empty($vars['settings']['hide_on_single_slide']) && count($vars['rows']) > 1) {
     $output = theme($vars['settings']['type'], array('vss_id' => $vars['vss_id'], 'view' => $vars['view'], 'settings' => $vars['settings'], 'location' => $vars['location'], 'rows' => $vars['rows']));
   }
 
diff --git a/views_slideshow.module b/views_slideshow.module
index b145682..4aef7e1 100644
--- a/views_slideshow.module
+++ b/views_slideshow.module
@@ -168,6 +168,20 @@ function views_slideshow_pager_views_slideshow_widget_form_options(&$form, &$for
       '#markup' => '<div class="vs-dependent-lvl2">',
     );
 
+    // Add field to see if they would like to hide pager if there is only one
+    // slide.
+    $form['hide_on_single_slide'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Hide pager if there is only one slide'),
+      '#default_value' => $defaults['hide_on_single_slide'],
+      '#description' => t('Should the pager be hidden if there is only one slide.'),
+      '#states' => array(
+        'visible' => array(
+          ':input[name="' . $dependency . '[enable]"]' => array('checked' => TRUE),
+        ),
+      ),
+    );
+
     // Create the widget type field.
     $form['type'] = array(
       '#type' => 'select',
@@ -276,21 +290,6 @@ function views_slideshow_pager_fields_views_slideshow_widget_pager_form_options(
     ),
   );
 
-  // Add field to see if they would like to activate hide pager if there is
-  // only one slide
-  $form['views_slideshow_pager_fields_hide_on_single_slide'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Hide pager if there is only one slide'),
-    '#default_value' => $defaults['views_slideshow_pager_fields_hide_on_single_slide'],
-    '#description' => t('Should the pager be hidden if there is only one slide.'),
-    '#states' => array(
-      'visible' => array(
-        ':input[name="' . $dependency . '[enable]"]' => array('checked' => TRUE),
-        ':input[name="' . $dependency . '[type]"]' => array('value' => 'views_slideshow_pager_fields'),
-      ),
-    ),
-  );
-
   $form['views_slideshow_pager_fields_wrapper_close'] = array(
     '#markup' => '</div>',
   );
@@ -315,6 +314,20 @@ function views_slideshow_controls_views_slideshow_widget_form_options(&$form, &$
     $form['views_slideshow_controls_wrapper'] = array(
       '#markup' => '<div class="vs-dependent-lvl2">',
     );
+    
+    // Add field to see if they would like to hide controls if there is only one
+    // slide
+    $form['hide_on_single_slide'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Hide controls if there is only one slide'),
+      '#default_value' => $defaults['hide_on_single_slide'],
+      '#description' => t('Should the controls be hidden if there is only one slide.'),
+      '#states' => array(
+        'visible' => array(
+          ':input[name="' . $dependency . '[enable]"]' => array('checked' => TRUE),
+        ),
+      ),
+    );
 
     // Create the widget type field.
     $form['type'] = array(
@@ -402,6 +415,7 @@ function views_slideshow_views_slideshow_option_definition() {
 
   // Defaults for the pager widget.
   foreach ($locations as $location) {
+    $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['hide_on_single_slide'] = array('default' => 0);
     $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['type'] = array('default' => 0);
     $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['views_slideshow_pager_numbered_hover'] = array('default' => 0);
     $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['views_slideshow_pager_numbered_click_to_page'] = array('default' => 0);
@@ -409,8 +423,8 @@ function views_slideshow_views_slideshow_option_definition() {
     $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['views_slideshow_pager_thumbnails_click_to_page'] = array('default' => 0);
     $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['views_slideshow_pager_fields_fields'] = array('default' => array());
     $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['views_slideshow_pager_fields_hover'] = array('default' => 0);
-    $options['widgets']['contains'][$location]['contains']['views_slideshow_pager']['contains']['views_slideshow_pager_fields_hide_on_single_slide'] = array('default' => 0);
 
+    $options['widgets']['contains'][$location]['contains']['views_slideshow_controls']['contains']['hide_on_single_slide'] = array('default' => 0);
     $options['widgets']['contains'][$location]['contains']['views_slideshow_controls']['contains']['type'] = array('default' => 0);
   }