diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt
index cee05be8ef..113c4934f8 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt
@@ -52,7 +52,12 @@ fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Un
                 navigateToUploadSuccess = { transferUrl ->
                     navController.navigate(UploadSuccessDestination(args.transferType, transferUrl))
                 },
-                navigateToUploadError = { navController.navigate(UploadErrorDestination) },
+                navigateToUploadError = {
+                    // Go back to ImportFiles before going to UploadError, to be able
+                    // to go back to ImportFiles when "Retry" button is clicked.
+                    navController.popBackStack()
+                    navController.navigate(UploadErrorDestination)
+                },
                 navigateBackToImportFiles = { navController.popBackStack() },
             )
         }
@@ -65,7 +70,7 @@ fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Un
             )
         }
         composable<UploadErrorDestination> {
-            UploadErrorScreen(navigateToImportFiles = { navController.navigate(ImportFilesDestination) })
+            UploadErrorScreen(navigateBackToImportFiles = { navController.popBackStack() })
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadErrorScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadErrorScreen.kt
index bc22273aac..1bd5ce971f 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadErrorScreen.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadErrorScreen.kt
@@ -32,14 +32,14 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 import com.infomaniak.core2.R as RCore2
 
 @Composable
-fun UploadErrorScreen(navigateToImportFiles: () -> Unit) {
+fun UploadErrorScreen(navigateBackToImportFiles: () -> Unit) {
     BottomStickyButtonScaffold(
         topBar = { BrandTopAppBar() },
         bottomButton = {
             LargeButton(
                 modifier = it,
                 title = stringResource(RCore2.string.buttonRetry),
-                onClick = navigateToImportFiles,
+                onClick = navigateBackToImportFiles,
             )
         }
     ) {
@@ -56,7 +56,7 @@ fun UploadErrorScreen(navigateToImportFiles: () -> Unit) {
 private fun UploadErrorScreenPreview() {
     SwissTransferTheme {
         Surface {
-            UploadErrorScreen({})
+            UploadErrorScreen {}
         }
     }
 }