diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
index fc449f5a1..e9cb56ab0 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
@@ -12,6 +12,7 @@ import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.ViewGroup;
@@ -137,6 +138,11 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
         if (showAllUpdateableApps) {
             notifyItemRangeInserted(appsToShowStatus.size() + 1, updateableApps.size());
+            if (recyclerView != null) {
+                // Scroll so that the "Update X apps" header is at the top of the page, and the
+                // list of apps takes up the rest of the screen.
+                ((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(appsToShowStatus.size(), 0);
+            }
         } else {
             notifyItemRangeRemoved(appsToShowStatus.size() + 1, updateableApps.size());
         }
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 76382bdd1..35a871a4e 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -35,7 +35,9 @@
         android:id="@+id/text_apps_to_update"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:text="SAnd, Birthday Droid, Dados D"
+        tools:text="SAnd, Birthday Droid, Dados D, Other app, Another app"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginEnd="8dp"
@@ -50,7 +52,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_apps_to_update"
-        android:background="@android:color/transparent"
+        android:background="?attr/selectableItemBackground"
         android:textColor="@color/fdroid_blue"
         android:padding="0dp"
         android:layout_marginStart="16dp"