diff --git a/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt b/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt
index 8dbf8749..1fcf3f5f 100644
--- a/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt
+++ b/storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt
@@ -74,7 +74,14 @@ class FileViewerViewModel @Inject constructor(
 
         val cancellable = omhStorageClient.listFiles(parentId)
             .addOnSuccess { data ->
-                val files: List<OmhFile> = data.files
+                val files: List<OmhFile> = data
+                    .files
+                    .sortedWith(
+                        compareBy<OmhFile> { !it.isFolder() }
+                            .thenBy { it.mimeType }
+                            .thenBy { it.name }
+                    )
+
                 setState(FileViewerViewState.Content(files))
             }
             .addOnFailure { e ->