diff --git a/res/layout/update_item_view.xml b/res/layout/update_item_view.xml
index 2825a646..0f89a159 100644
--- a/res/layout/update_item_view.xml
+++ b/res/layout/update_item_view.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/card_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginEnd="5dp"
     android:layout_marginStart="5dp"
     android:layout_marginTop="5dp"
-    android:foreground="?attr/selectableItemBackground">
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:nextFocusRight="@+id/update_action">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -90,12 +93,13 @@
             android:layout_height="match_parent">
 
             <ImageButton
-                android:id="@+id/update_action"
+                android:id="@id/update_action"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_centerInParent="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="Download"
+                android:nextFocusLeft="@id/card_view"
                 android:src="@drawable/ic_download" />
         </RelativeLayout>
     </LinearLayout>