diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d31fb3070d9..212290d81a6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1200,7 +1200,8 @@
 
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
-            android:label="@string/notification_history_title">
+            android:label="@string/notification_history_title"
+            android:taskAffinity="com.android.settings.notification">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2530,6 +2531,7 @@
         <activity
             android:name="Settings$ConfigureNotificationSettingsActivity"
             android:label="@string/configure_notification_settings"
+            android:taskAffinity="com.android.settings.notification"
             android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_SETTINGS" />
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 144d102e651..a5993e4a773 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -23,6 +23,7 @@ import android.app.ActivityManager;
 import android.app.INotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -191,6 +192,20 @@ public class NotificationHistoryActivity extends Activity {
         super.onDestroy();
     }
 
+    @Override
+    public void onBackPressed() {
+        handleBackPressed();
+    }
+
+    private void handleBackPressed() {
+        if (getFragmentManager().getBackStackEntryCount() > 1) {
+            super.onBackPressed();
+        } else {
+            startActivity(new Intent(Settings.ACTION_NOTIFICATION_SETTINGS));
+            finish();
+        }
+    }
+
     private void bindSwitch() {
         if (mSwitchBar != null) {
             mSwitchBar.setSwitchBarText(R.string.notification_history_toggle,