diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml
index 30a34d4..530e856 100644
--- a/res/layout/widgets_list_row_view.xml
+++ b/res/layout/widgets_list_row_view.xml
@@ -41,7 +41,7 @@
         android:paddingRight="@dimen/widget_section_horizontal_padding"
         android:paddingTop="@dimen/widget_section_vertical_padding"
         android:singleLine="true"
-        android:textColor="@color/widgets_view_section_text_color"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp"
         launcher:customShadows="false"
         launcher:deferShadowGeneration="true"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ccbae58..809fc6d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -46,8 +46,7 @@
     <color name="spring_loaded_highlighted_panel_border_color">#FFF</color>
 
     <!-- Widgets view -->
-    <color name="widgets_view_section_text_color">#FFFFFF</color>
-    <color name="widgets_view_item_text_color">#C4C4C4</color>
+    <color name="widgets_view_item_text_color">#3B3B3B</color>
 
     <!-- Used as a fallback since colorSecondary doesn't exist pre-API 25 -->
     <color name="fallback_secondary_color">#FF37474F</color>
diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java
index 1429df5..61b8a7a 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java
@@ -135,8 +135,6 @@
 
         // The provider info or the views might have changed.
         checkIfAutoAdvance();
-
-        mIsScrollable = checkScrollableRecursively(this);
     }
 
     private boolean checkScrollableRecursively(ViewGroup viewGroup) {
@@ -383,6 +381,8 @@
                 }
             });
         }
+
+        mIsScrollable = checkScrollableRecursively(this);
     }
 
     @Override