diff --git a/catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java b/catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java
index 48d77cde799..894b3dbd59f 100644
--- a/catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java
@@ -109,6 +109,8 @@ public View onCreateDemoView(
     restrictExpansionSwitch.setOnCheckedChangeListener(
         (buttonView, isChecked) -> {
           fullScreenSwitch.setEnabled(!isChecked);
+          view.findViewById(R.id.drag_handle).setEnabled(!isChecked);
+          bottomSheetInternal.findViewById(R.id.drag_handle).setEnabled(!isChecked);
           updateBottomSheetHeights();
         });
 
diff --git a/catalog/java/io/material/catalog/bottomsheet/res/layout/cat_bottomsheet_content.xml b/catalog/java/io/material/catalog/bottomsheet/res/layout/cat_bottomsheet_content.xml
index 6d86bfb9ed6..b86c20586ff 100644
--- a/catalog/java/io/material/catalog/bottomsheet/res/layout/cat_bottomsheet_content.xml
+++ b/catalog/java/io/material/catalog/bottomsheet/res/layout/cat_bottomsheet_content.xml
@@ -21,6 +21,7 @@
     android:layout_height="600dp">
 
     <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+      android:id="@+id/drag_handle"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"/>