diff --git src/sites/all/modules/workflow/workflow.js src/sites/all/modules/workflow/workflow.js
new file mode 100644
index 0000000..5aa71c0
--- /dev/null
+++ src/sites/all/modules/workflow/workflow.js
@@ -0,0 +1,25 @@
+/**
+ * Show/hide the schedule date fields depending on choice selected
+ * If "immediately" is selected, let's not confuse users with the date/time fields
+ */
+$(document).ready(function() {
+
+  var $displayFields = $("#edit-workflow-scheduled-date-wrapper,#edit-workflow-scheduled-hour-wrapper");
+
+  var $curVal = $("input:radio[name=workflow_scheduled]:checked").val();
+
+  if ($curVal < 1) {
+    $displayFields.hide();
+  }
+
+  $("input:radio[name=workflow_scheduled]").click(function() {
+    var $newVal = $(this).val();
+    if ($newVal < 1) {
+      $displayFields.hide();
+    }
+    else {    
+      $displayFields.show();
+    }
+  });
+
+});
diff --git src/sites/all/modules/workflow/workflow.pages.inc src/sites/all/modules/workflow/workflow.pages.inc
index ed852e5..8393a1c 100644
--- src/sites/all/modules/workflow/workflow.pages.inc
+++ src/sites/all/modules/workflow/workflow.pages.inc
@@ -118,6 +118,11 @@ function theme_workflow_deleted_state($state_name) {
  *   Form definition array.
  */
 function workflow_tab_form($form_state, $node, $wid, $states, $current) {
+
+  // add js to show/hide schedule dates depending on context
+  $path = drupal_get_path('module', 'workflow');
+  drupal_add_js($path . '/workflow.js', 'module');
+
   $form['#tab'] = TRUE;
   $choices = workflow_field_choices($node);