diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
index 1d26cade69324a..caab7aa1186e51 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
@@ -11,7 +11,6 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
-import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import com.chip.casting.DiscoveredNodeData;
@@ -76,18 +75,11 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     View.OnClickListener manualCommissioningButtonOnClickListener =
         v -> callback.handleCommissioningButtonClicked(null);
     manualCommissioningButton.setOnClickListener(manualCommissioningButtonOnClickListener);
+
     ArrayAdapter<DiscoveredNodeData> arrayAdapter =
         new VideoPlayerCommissionerAdapter(getActivity(), commissionerVideoPlayerList);
     final ListView list = getActivity().findViewById(R.id.commissionerList);
     list.setAdapter(arrayAdapter);
-    list.setOnItemClickListener(
-        (parent, view1, position, id) -> {
-          DiscoveredNodeData discoveredNodeData =
-              (DiscoveredNodeData) parent.getItemAtPosition(position);
-          Log.d(TAG, "OnItemClickListener.onClick called for " + discoveredNodeData);
-          Callback callback1 = (Callback) getActivity();
-          callback1.handleCommissioningButtonClicked(discoveredNodeData);
-        });
 
     this.successCallback =
         new SuccessCallback<DiscoveredNodeData>() {
@@ -157,21 +149,32 @@ public interface Callback {
 
 class VideoPlayerCommissionerAdapter extends ArrayAdapter<DiscoveredNodeData> {
   private final List<DiscoveredNodeData> playerList;
+  private final Context context;
   private LayoutInflater inflater;
+  private static final String TAG = VideoPlayerCommissionerAdapter.class.getSimpleName();
 
-  public VideoPlayerCommissionerAdapter(
-      Context applicationContext, List<DiscoveredNodeData> playerList) {
-    super(applicationContext, 0, playerList);
+  public VideoPlayerCommissionerAdapter(Context context, List<DiscoveredNodeData> playerList) {
+    super(context, 0, playerList);
+    this.context = context;
     this.playerList = playerList;
-    inflater = (LayoutInflater.from(applicationContext));
+    inflater = (LayoutInflater.from(context));
   }
 
   @Override
   public View getView(int i, View view, ViewGroup viewGroup) {
     view = inflater.inflate(R.layout.commissionable_player_list_item, null);
     String buttonText = getCommissionerButtonText(playerList.get(i));
-    TextView playerDescription = view.findViewById(R.id.commissionable_player_description);
+    Button playerDescription = view.findViewById(R.id.commissionable_player_description);
     playerDescription.setText(buttonText);
+    View.OnClickListener clickListener =
+        v -> {
+          DiscoveredNodeData discoveredNodeData = playerList.get(i);
+          Log.d(TAG, "OnItemClickListener.onClick called for " + discoveredNodeData);
+          CommissionerDiscoveryFragment.Callback callback1 =
+              (CommissionerDiscoveryFragment.Callback) context;
+          callback1.handleCommissioningButtonClicked(discoveredNodeData);
+        };
+    playerDescription.setOnClickListener(clickListener);
     return view;
   }
 
diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
index c48b28974ef22e..4f090b20e9ef20 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ConnectionFragment.java
@@ -25,7 +25,6 @@ public class ConnectionFragment extends Fragment {
   private final TvCastingApp tvCastingApp;
   private final DiscoveredNodeData selectedCommissioner;
 
-  private boolean verifyOrEstablishConnectionSuccess;
   private boolean openCommissioningWindowSuccess;
   private boolean sendUdcSuccess;
 
@@ -83,9 +82,8 @@ public void handle(ContentApp contentApp) {
     if (selectedCommissioner != null && selectedCommissioner.isPreCommissioned()) {
       VideoPlayer videoPlayer = selectedCommissioner.toConnectableVideoPlayer();
       Log.d(TAG, "Calling verifyOrEstablishConnectionSuccess with VideoPlayer: " + videoPlayer);
-      this.verifyOrEstablishConnectionSuccess =
-          tvCastingApp.verifyOrEstablishConnection(
-              videoPlayer, onConnectionSuccess, onConnectionFailure, onNewOrUpdatedEndpoints);
+      tvCastingApp.verifyOrEstablishConnection(
+          videoPlayer, onConnectionSuccess, onConnectionFailure, onNewOrUpdatedEndpoints);
     } else {
       Log.d(TAG, "Running commissioning");
       this.openCommissioningWindowSuccess =
diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml
index 979093e5efb8d8..a3adc515f19184 100644
--- a/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml
+++ b/examples/tv-casting-app/android/App/app/src/main/res/layout/commissionable_player_list_item.xml
@@ -3,14 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
+    <Button
         android:id="@+id/commissionable_player_description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:text="blah"
-        android:textAlignment="center"
-        android:textColor="@android:color/black"
-        android:textSize="20dp" />
+        android:padding="10dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
index b9645a288d6449..7cfdf23b0b335b 100644
--- a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
+++ b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
@@ -7,8 +7,8 @@
 
     <LinearLayout
         android:id="@+id/castingCommissioners"
-        android:layout_width="409dp"
-        android:layout_height="729dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         tools:layout_editor_absoluteX="1dp"
         tools:layout_editor_absoluteY="1dp"
@@ -34,8 +34,9 @@
 
         <ListView
             android:id = "@+id/commissionerList"
-            android:layout_width = "wrap_content"
-            android:layout_height = "wrap_content"/>
+            android:layout_width = "match_parent"
+            android:layout_height = "wrap_content"
+            android:fadeScrollbars = "false" />
     </LinearLayout>