diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index a243c733ba3a..e7b0e7876f72 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -765,8 +765,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         if (mFocused == null) {
             super.clearFocus();
         } else {
-            mFocused.clearFocus();
+            View focused = mFocused;
             mFocused = null;
+            focused.clearFocus();
         }
     }
 
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index a84ece629faa..94aa0f62c019 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -1344,8 +1344,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                     }
                 } return;
             }
-            super.addFocusables(views, direction, focusableMode);
         }
+        super.addFocusables(views, direction, focusableMode);
     }
 
     @Override