diff --git a/sites/all/modules/tvi/includes/tvi.admin.inc b/sites/all/modules/tvi/includes/tvi.admin.inc
index 5306dc7..fed0da2 100755
--- a/sites/all/modules/tvi/includes/tvi.admin.inc
+++ b/sites/all/modules/tvi/includes/tvi.admin.inc
@@ -214,10 +214,11 @@ function tvi_submit_handler($form, &$form_state) {
   }   
 
   if (!$settings->is_default || $settings->status) {
-    tvi_update_settings($settings);
     if ($settings->type == TVI_TYPE_ALL) {
+      $settings->status = TRUE;
       drupal_set_message(t('The configuration options have been saved.'));
     }   
+    tvi_update_settings($settings);
   }   
 }
 
@@ -265,4 +266,4 @@ function tvi_get_view_displays() {
   }   
 
   return $displays;
-}
\ No newline at end of file
+}