diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/DataSetTableScreen.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/DataSetTableScreen.kt
index 315b7e7b50..d9fd68c221 100644
--- a/compose-table/src/main/java/org/dhis2/composetable/ui/DataSetTableScreen.kt
+++ b/compose-table/src/main/java/org/dhis2/composetable/ui/DataSetTableScreen.kt
@@ -153,9 +153,8 @@ fun DataSetTableScreen(
         if (isKeyboardOpen == Keyboard.Closed) {
             if (tableConfiguration.textInputViewMode) {
                 focusManager.clearFocus(true)
-            } else if (bottomSheetState.bottomSheetState.isExpanded) {
+            } else {
                 collapseBottomSheet(true)
-                bottomSheetState.bottomSheetState.collapse()
             }
         }
     }
diff --git a/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/managestock/components/ManageStockTable.kt b/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/managestock/components/ManageStockTable.kt
index 158d7f3a7f..a5bdaedb3e 100644
--- a/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/managestock/components/ManageStockTable.kt
+++ b/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/managestock/components/ManageStockTable.kt
@@ -146,6 +146,7 @@ fun ManageStockTable(
                 tableDimensions = dimensions,
                 tableConfiguration = TableConfiguration(
                     headerActionsEnabled = false,
+                    textInputViewMode = false,
                 ),
                 tableValidator = viewModel,
                 tableResizeActions = tableResizeActions,