diff --git a/modules/qtip_views/qtip_views.module b/modules/qtip_views/qtip_views.module
index 3ba7e51..3fb67ca 100644
--- a/modules/qtip_views/qtip_views.module
+++ b/modules/qtip_views/qtip_views.module
@@ -90,15 +90,16 @@ function qtip_views_form_alter(&$form, &$form_state, $form_id) {
 function qtip_views_form_views_ui_config_item_form_submit($form, &$form_state) {
   // Set the tooltip in our display extender.
   $display_id = $form_state['values']['override']['dropdown'];
+  $options = $form_state['values']['options'];
   $tooltips = $form_state['tooltips'];
   $form_state['view']->set_display($display_id);
   $id = $form_state['id'];
 
   // Handle the submission for the label tooltip
-  if ($form_state['values']['options']['element_label_tooltip_show']
-    && !empty($form_state['values']['options']['element_label_tooltip'])) {
-    $tooltips[$id]['show'] = $form_state['values']['options']['element_label_tooltip_show'];
-    $tooltips[$id]['tooltip'] = $form_state['values']['options']['element_label_tooltip'];
+  if ($options['element_label_tooltip_show']
+    && !empty($options['element_label_tooltip'])) {
+    $tooltips[$id]['show'] = $options['element_label_tooltip_show'];
+    $tooltips[$id]['tooltip'] = $options['element_label_tooltip'];
   }
   else {
     unset($tooltips[$id]);
@@ -106,17 +107,15 @@ function qtip_views_form_views_ui_config_item_form_submit($form, &$form_state) {
   $form_state['view']->display_handler->set_option('qtip_tooltips', $tooltips);
 
   // Handle the submission for the element tooltip
-  if ($form_state['values']['options']['element_qtip']) {
-    $item = $form_state['view']->get_item($display_id, 'field', $id);
+  $item = $form_state['view']->get_item($display_id, 'field', $id);
 
-    $item['element_qtip'] = $form_state['values']['options']['element_qtip'];
-    $item['qtip_title'] = $form_state['values']['options']['qtip_title'];
-    $item['qtip_text'] = $form_state['values']['options']['qtip_text'];
-    $item['qtip_hide_if_equal'] = $form_state['values']['options']['qtip_hide_if_equal'];
-    $item['qtip_instance'] = $form_state['values']['options']['qtip_instance'];
+  $item['element_qtip'] = $options['element_qtip'];
+  $item['qtip_title'] = $options['qtip_title'];
+  $item['qtip_text'] = $options['qtip_text'];
+  $item['qtip_hide_if_equal'] = $options['qtip_hide_if_equal'];
+  $item['qtip_instance'] = $options['qtip_instance'];
 
-    $form_state['view']->set_item($display_id, 'field', $id, $item);
-  }
+  $form_state['view']->set_item($display_id, 'field', $id, $item);
 
   // Write to cache.
   views_ui_cache_set($form_state['view']);
