diff --git a/src/translation/en.json b/src/translation/en.json
index 0020c971f..f8b8954d7 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1625,7 +1625,8 @@
             "title": "Import Backup",
             "description": "Any data generated between now and the last known backup will be irrevocably lost. It is recommended to create a backup of the current data before attempting an import.",
             "uploadAction": "Upload Backup Config",
-            "importAction": "Import"
+            "importAction": "Import",
+            "remotePath": "Backup Path"
         },
         "updateDialog": {
             "title": "Update {{ app }}",
diff --git a/src/views/app.html b/src/views/app.html
index ebbbbe2c0..961fbf81c 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -241,12 +241,6 @@
             <select class="form-control" id="storageProvider" ng-model="importBackup.provider" ng-options="a.value as a.name for a in storageProviders" ng-change="importBackup.clearForm()" ng-disabled="importBackup.busy"></select>
           </div>
 
-          <div class="form-group" ng-class="{ 'has-error': importBackup.error.remotePath }">
-            <label ng-show="importBackup.provider !== 'filesystem'" class="control-label" for="inputImportBackupId">Remote Path</label>
-            <label ng-show="importBackup.provider === 'filesystem'" class="control-label" for="inputImportBackupId">Backup Path</label>
-            <input type="text" class="form-control" ng-model="importBackup.remotePath" id="inputImportRemotePath" ng-disabled="importBackup.busy" required>
-          </div>
-
           <!-- S3/Minio/SOS/GCS -->
           <div class="form-group" ng-class="{ 'has-error': importBackup.error.endpoint }" ng-show="importBackup.provider === 'minio' || importBackup.provider === 'upcloud-objectstorage' || importBackup.provider === 'backblaze-b2' || importBackup.provider === 'cloudflare-r2' || importBackup.provider === 's3-v4-compat' || importBackup.provider === 'idrive-e2'">
             <label class="control-label" for="inputimportBackupEndpoint">{{ 'backups.configureBackupStorage.s3Endpoint' | tr }}</label>
@@ -276,12 +270,30 @@
             <input type="text" class="form-control" ng-model="importBackup.mountOptions.host" id="configureBackupHost" name="host" ng-disabled="importBackup.busy" placeholder="Server IP or hostname" ng-required="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
           </div>
 
+          <!-- SSHFS -->
+          <div class="form-group" ng-show="importBackup.provider === 'sshfs'">
+            <label class="control-label" for="configureBackupPort">{{ 'backups.configureBackupStorage.port' | tr }}</label>
+            <input type="number" class="form-control" ng-model="importBackup.mountOptions.port" id="configureBackupPort" name="port" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'">
+          </div>
+
            <!-- CIFS/NFS/SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
             <label class="control-label" for="configureBackupRemoteDir">{{ 'backups.configureBackupStorage.remoteDirectory' | tr }} ({{ importBackup.provider }})</label>
             <input type="text" class="form-control" ng-model="importBackup.mountOptions.remoteDir" id="configureBackupRemoteDir" name="remoteDir" ng-disabled="importBackup.busy" placeholder="/share" ng-required="importBackup.provider === 'cifs' || importBackup.provider === 'nfs' || importBackup.provider === 'sshfs'">
           </div>
 
+          <!-- EXT4/XFS -->
+          <div class="form-group" ng-show="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'" ng-class="{ 'has-error': importBackup.error.diskPath }">
+            <label class="control-label" for="configureBackupDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
+            <input type="text" class="form-control" ng-model="importBackup.mountOptions.diskPath" id="configureBackupDiskPath" name="diskPath" ng-disabled="importBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'">
+         </div>
+
+          <!-- remotePath contains the prefix as well -->
+          <div class="form-group" ng-class="{ 'has-error': importBackup.error.remotePath }">
+            <label class="control-label" for="inputImportBackupId">{{ 'app.importBackupDialog.remotePath' | tr }} <sup><a ng-href="https://docs.cloudron.io/backups/#import-app-backup" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <input type="text" class="form-control" ng-model="importBackup.remotePath" id="inputImportRemotePath" ng-disabled="importBackup.busy" required>
+          </div>
+
           <!-- CIFS -->
           <div class="form-group" ng-show="importBackup.provider === 'cifs'">
             <label class="control-label" for="configureBackupUsername">{{ 'backups.configureBackupStorage.username' | tr }} ({{ importBackup.provider }})</label>
@@ -294,18 +306,6 @@
             <input type="password" class="form-control" ng-model="importBackup.mountOptions.password" id="configureBackupPassword" name="password" ng-disabled="importBackup.busy" password-reveal>
           </div>
 
-          <!-- EXT4/XFS -->
-          <div class="form-group" ng-show="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'" ng-class="{ 'has-error': importBackup.error.diskPath }">
-            <label class="control-label" for="configureBackupDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
-            <input type="text" class="form-control" ng-model="importBackup.mountOptions.diskPath" id="configureBackupDiskPath" name="diskPath" ng-disabled="importBackup.busy" placeholder="Directory for backups" ng-required="importBackup.provider === 'ext4' || importBackup.provider === 'xfs'">
-         </div>
-
-          <!-- SSHFS -->
-          <div class="form-group" ng-show="importBackup.provider === 'sshfs'">
-            <label class="control-label" for="configureBackupPort">{{ 'backups.configureBackupStorage.port' | tr }}</label>
-            <input type="number" class="form-control" ng-model="importBackup.mountOptions.port" id="configureBackupPort" name="port" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'">
-          </div>
-
           <!-- SSHFS -->
           <div class="form-group" ng-show="importBackup.provider === 'sshfs'">
             <label class="control-label" for="configureBackupUser">{{ 'backups.configureBackupStorage.user' | tr }}</label>
@@ -318,12 +318,6 @@
             <textarea class="form-control" ng-model="importBackup.mountOptions.privateKey" id="configureBackupPrivateKey" name="privateKey" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 'sshfs'"></textarea>
           </div>
 
-          <!-- Filesystem -->
-          <div class="form-group" ng-class="{ 'has-error': importBackup.error.prefix }" ng-show="importBackup.provider !== 'filesystem' && importBackup.provider !== ''">
-            <label class="control-label" for="inputimportBackupPrefix">{{ 'backups.configureBackupStorage.prefix' | tr }}</label>
-            <input type="text" class="form-control" ng-model="importBackup.prefix" id="inputimportBackupPrefix" name="prefix" ng-disabled="importBackup.busy" placeholder="Prefix for backup file names">
-          </div>
-
           <div class="form-group" ng-class="{ 'has-error': importBackup.error.region }" ng-show="importBackup.provider === 's3'">
             <label class="control-label" for="inputImportBackupS3Region">{{ 'backups.configureBackupStorage.region' | tr }}</label>
             <select class="form-control" name="region" id="inputImportBackupS3Region" ng-model="importBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="importBackup.busy" ng-required="importBackup.provider === 's3'"></select>
diff --git a/src/views/app.js b/src/views/app.js
index fb2ea730c..a122e75c4 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1288,7 +1288,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         clearForm: function () {
             // $scope.importBackup.provider = ''; // do not clear since we call this function on provider change
             $scope.importBackup.bucket = '';
-            $scope.importBackup.prefix = '';
             $scope.importBackup.mountPoint = '';
             $scope.importBackup.accessKeyId = '';
             $scope.importBackup.secretAccessKey = '';
@@ -1321,7 +1320,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             // only set provider specific fields, this will clear them in the db
             if ($scope.s3like(backupConfig.provider)) {
                 backupConfig.bucket = $scope.importBackup.bucket;
-                backupConfig.prefix = $scope.importBackup.prefix;
+                backupConfig.prefix = '';
                 backupConfig.accessKeyId = $scope.importBackup.accessKeyId;
                 backupConfig.secretAccessKey = $scope.importBackup.secretAccessKey;
 
@@ -1364,7 +1363,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 }
             } else if (backupConfig.provider === 'gcs') {
                 backupConfig.bucket = $scope.importBackup.bucket;
-                backupConfig.prefix = $scope.importBackup.prefix;
+                backupConfig.prefix = '';
                 try {
                     var serviceAccountKey = JSON.parse($scope.importBackup.gcsKey.content);
                     backupConfig.projectId = serviceAccountKey.project_id;
@@ -1384,7 +1383,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 }
             } else if (backupConfig.provider === 'sshfs' || backupConfig.provider === 'cifs' || backupConfig.provider === 'nfs' || backupConfig.provider === 'ext4' || backupConfig.provider === 'xfs') {
                 backupConfig.mountOptions = $scope.importBackup.mountOptions;
-                backupConfig.prefix = $scope.importBackup.prefix;
+                backupConfig.prefix = '';
             } else if (backupConfig.provider === 'mountpoint') {
                 backupConfig.mountOptions = {};
                 backupConfig.mountPoint = $scope.mountPoint;
@@ -2053,9 +2052,13 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             var backupConfig;
             try {
                 backupConfig = JSON.parse(result.target.result);
+                let prefix = backupConfig.prefix;
+                backupConfig.prefix = ''; // so it can clear the form as well when we apply keys below
                 if (backupConfig.provider === 'filesystem') { // patch the remotePath to have the full path
-                    backupConfig.remotePath = backupConfig.backupFolder + '/' + backupConfig.remotePath;
+                    backupConfig.remotePath = (prefix ? prefix + '/' : '') + backupConfig.backupFolder + '/' + backupConfig.remotePath;
                     delete backupConfig.backupFolder;
+                } else {
+                    backupConfig.remotePath = (prefix ? prefix + '/' : '') + backupConfig.remotePath;
                 }
             } catch (e) {
                 console.error('Unable to parse backup config');