diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 0d003b3..4a2c262 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -781,6 +781,7 @@
 
             final boolean matchFound = pm.resolveActivity(mAppSettingsIntent, 0) != null;
             mAppSettings.setEnabled(matchFound);
+            mAppSettings.setVisibility(View.VISIBLE);
 
         } else {
             mAppSettingsIntent = null;
@@ -1047,6 +1048,8 @@
     private OnClickListener mAppSettingsListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
+            if (!isAdded()) return;
+
             // TODO: target torwards entire UID instead of just first package
             startActivity(mAppSettingsIntent);
         }