diff --git a/res/values/custom_arrays.xml b/res/values/custom_arrays.xml
index 414a4c2..35f4b05 100644
--- a/res/values/custom_arrays.xml
+++ b/res/values/custom_arrays.xml
@@ -371,6 +371,7 @@
         <item>max_temp_app_whitelist_duration</item>
         <item>mms_temp_app_whitelist_duration</item>
         <item>sms_temp_app_whitelist_duration</item>
+        <item>notification_whitelist_duration</item>
     </string-array>
 
     <string-array name="idle_config_keys_basic" translatable="false">
@@ -384,8 +385,6 @@
         <item>idle_after_inactive_to</item>
         <item>idle_pending_to</item>
         <item>idle_to</item>
-        <item>min_time_to_alarm</item>
-        <item>max_temp_app_whitelist_duration</item>
     </string-array>
 
     <string-array name="idle_config_desc" translatable="false">
@@ -414,6 +413,7 @@
         <item>@string/DESC_MAX_TEMP_APP_WHITELIST_DURATION</item>
         <item>@string/DESC_MMS_TEMP_APP_WHITELIST_DURATION</item>
         <item>@string/DESC_SMS_TEMP_APP_WHITELIST_DURATION</item>
+        <item>@string/DESC_KEY_NOTIFICATION_WHITELIST_DURATION</item>
     </string-array>
 
     <string-array name="idle_config_short" translatable="false">
@@ -442,5 +442,6 @@
         <item>@string/SHORT_MAX_TEMP_APP_WHITELIST_DURATION</item>
         <item>@string/SHORT_MMS_TEMP_APP_WHITELIST_DURATION</item>
         <item>@string/SHORT_SMS_TEMP_APP_WHITELIST_DURATION</item>
+        <item>@string/SHORT_KEY_NOTIFICATION_WHITELIST_DURATION</item>
     </string-array>
 </resources>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index d3dade1..652737a 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -556,6 +556,7 @@
     <string name="DESC_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET">This is the maximum amount of time we want to make available for maintenance mode when lightly idling</string>
     <string name="DESC_MIN_LIGHT_MAINTENANCE_TIME">This is the minimum amount of time that we will stay in maintenance mode after a light doze</string>
     <string name="DESC_MIN_DEEP_MAINTENANCE_TIME">This is the minimum amount of time that we will stay in maintenance mode after a full doze</string>
+    <string name="DESC_KEY_NOTIFICATION_WHITELIST_DURATION">Amount of time we would like to whitelist an app that is handling a notification</string>
 
     <string name="SHORT_INACTIVE_TIMEOUT">Inactive timeout</string>
     <string name="SHORT_SENSING_TIMEOUT">Sensing timeout</string>
@@ -582,5 +583,5 @@
     <string name="SHORT_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET">Maintenance mode light idle max timeout</string>
     <string name="SHORT_MIN_LIGHT_MAINTENANCE_TIME">Maintenance mode light doze min timeout</string>
     <string name="SHORT_MIN_DEEP_MAINTENANCE_TIME">Maintenance mode full doze min timeout</string>
-
+    <string name="SHORT_KEY_NOTIFICATION_WHITELIST_DURATION">Max notification whitelist duration</string>
 </resources>
diff --git a/src/org/omnirom/omnigears/system/DozeSettings.java b/src/org/omnirom/omnigears/system/DozeSettings.java
index 8440e42..e37bdf6 100644
--- a/src/org/omnirom/omnigears/system/DozeSettings.java
+++ b/src/org/omnirom/omnigears/system/DozeSettings.java
@@ -84,6 +84,7 @@
     final long MAX_TEMP_APP_WHITELIST_DURATION = 5 * 60 * 1000L;
     final long MMS_TEMP_APP_WHITELIST_DURATION = 60 * 1000L;
     final long SMS_TEMP_APP_WHITELIST_DURATION = 20 * 1000L;
+    final long NOTIFICATION_WHITELIST_DURATION = 30 * 1000L;
 
     private int millisecondsInOneSecond = 1000;
     private LinearLayout mContainer;
@@ -155,6 +156,7 @@
         mIdleConfigValues.add(MAX_TEMP_APP_WHITELIST_DURATION);
         mIdleConfigValues.add(MMS_TEMP_APP_WHITELIST_DURATION);
         mIdleConfigValues.add(SMS_TEMP_APP_WHITELIST_DURATION);
+        mIdleConfigValues.add(NOTIFICATION_WHITELIST_DURATION);
 
         mContainer = (LinearLayout) view.findViewById(R.id.idle_config_container);
         createOptionsList(inflater);