﻿diff --git views_plugin_node_fullcalendar.inc views_plugin_node_fullcalendar.inc
index 44247ba..b65a622 100644
--- views_plugin_node_fullcalendar.inc
+++ views_plugin_node_fullcalendar.inc
@@ -85,6 +85,21 @@
       '#process' => array('form_process_select', 'ctools_dependent_process'),
       '#dependency' => array('edit-row-options-custom-fc-date' => array(1)),
     );
+
+    // Disable form elements when needed
+    if(empty($field_options)) {
+      $form['custom']['#description'] = t('All the options are hidden, you have to add fields first.');
+      $form['custom']['fc_title']['#type'] = 'hidden';
+      $form['custom']['fc_title_field']['#type'] = 'hidden';
+      $form['custom']['fc_url']['#type'] = 'hidden';
+      $form['custom']['fc_url_field']['#type'] = 'hidden';
+      $form['custom']['fc_date']['#type'] = 'hidden';
+      $form['custom']['fc_date_field']['#type'] = 'hidden';
+    }
+    if(empty($date_fields)) {
+     $form['custom']['fc_date']['#type'] = 'hidden';
+     $form['custom']['fc_date_field']['#type'] = 'hidden';
+    }
   }
 
   function render($row) {
