diff --git a/SweetDreamsLib/res/xml/settings_lite.xml b/SweetDreamsLib/res/xml/settings_lite.xml
index 0892025..475274c 100644
--- a/SweetDreamsLib/res/xml/settings_lite.xml
+++ b/SweetDreamsLib/res/xml/settings_lite.xml
@@ -16,23 +16,16 @@
 	        <CheckBoxPreference
                 	android:title="Enable"
                     android:summary="Enable Timer"
-                    android:defaultValue="false"
-                    android:key="timer_enabled"
-                        />
+                    android:key="timer_enabled" android:enabled="false" android:defaultValue="true"/>
                         
              <com.TwentyCodes.android.SweetDreamsLib.TimePickerPreference
-             	android:title="Timer"
-	            android:enabled="false"
-	            android:key="timer_length"
-				 />
+             	android:enabled="false" android:key="timer_length"/>
 	            
 	          <CheckBoxPreference
                 	android:title="Exit On Finish"
                     android:summary="Closes Application When Timer Finishes"
                     android:defaultValue="false"
-                    android:key="timer_exit_on_finish"
-                    android:dependency="timer_enabled"
-                        />
+                    android:key="timer_exit_on_finish"/>
                         
 	 </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/SweetDreamsLib/src/com/TwentyCodes/android/SweetDreamsLib/SweetDreamsFull.java b/SweetDreamsLib/src/com/TwentyCodes/android/SweetDreamsLib/SweetDreamsFull.java
index 3a29897..d29034c 100644
--- a/SweetDreamsLib/src/com/TwentyCodes/android/SweetDreamsLib/SweetDreamsFull.java
+++ b/SweetDreamsLib/src/com/TwentyCodes/android/SweetDreamsLib/SweetDreamsFull.java
@@ -132,7 +132,13 @@ public class SweetDreamsFull extends Activity implements OnClickListener, OnSeek
 			isPlaying = true;
 			loadSound();
 			mMediaPlayer.start();
-			if (mSettings.getBoolean(Settings.TIMER_ENABLED, false)){
+			
+			boolean timerEnabled = mSettings.getBoolean(Settings.TIMER_ENABLED, false);
+			
+			if(isFUll == false)
+				timerEnabled = true;
+			
+			if (timerEnabled){
 				Log.v(TAG,"Starting timer");
 				long time = + (mSettings.getInt("timer_length", 30) * 60000);
 				Log.v(TAG,"time = " + time);