diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/collection/CollectionEditorScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/collection/CollectionEditorScreen.kt
index f71cbfac..8d0f310c 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/collection/CollectionEditorScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/collection/CollectionEditorScreen.kt
@@ -45,6 +45,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.activity.compose.BackHandler
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -505,6 +506,10 @@ private fun FolderEditorPage(
     val folder = state.editingFolder ?: return
     val bottomInset = nuvioPlatformExtraBottomPadding
 
+    BackHandler {
+        onBack()
+    }
+
     Box(modifier = Modifier.fillMaxSize()) {
         NuvioScreen(modifier = Modifier.fillMaxSize()) {
             stickyHeader {