diff --git a/src/org/hwo/ui/JTimeSpanEditor.java b/src/org/hwo/ui/JTimeSpanEditor.java
index 2aa4902..c14f265 100644
--- a/src/org/hwo/ui/JTimeSpanEditor.java
+++ b/src/org/hwo/ui/JTimeSpanEditor.java
@@ -169,6 +169,7 @@ public class JTimeSpanEditor extends JComponent implements FocusListener {
 		spMinutes.setEnabled(enable);
 		spHours.setEnabled(enable);
 		spDays.setEnabled(enable);
+		lblD.setEnabled(enable);
 	}
 	
 	public void setValue(Integer seconds){
@@ -176,7 +177,10 @@ public class JTimeSpanEditor extends JComponent implements FocusListener {
 		
 		if (mod == null){
 			cbNull.setSelected(false);
+			enableControls(false);
 		} else {
+			enableControls(true);
+			
 			cbNull.setSelected(true);
 			
 			if (spDays.isVisible())
@@ -215,7 +219,7 @@ public class JTimeSpanEditor extends JComponent implements FocusListener {
 			spDays.setValue(new Integer(0));
 		}
 		spDays.setVisible(daysEnabled);
-		spDays.setEnabled(daysEnabled);
+//		spDays.setEnabled(daysEnabled);
 		lblD.setVisible(daysEnabled);
 	}