diff --git a/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.html b/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.html
index 509c6025d37..529fca185ab 100644
--- a/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.html
+++ b/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.html
@@ -46,14 +46,23 @@
             ></ix-input>
           }
           @if (form.controls.folder.enabled) {
-            <ix-explorer
-              formControlName="folder"
-              root="/"
-              [label]="helptext.folder_placeholder | translate"
-              [tooltip]="helptext.folder_tooltip | translate"
-              [nodeProvider]="bucketNodeProvider"
-              [required]="true"
-            ></ix-explorer>
+            @if (isNewBucketOptionSelected) {
+              <ix-input
+                formControlName="folder"
+                [label]="helptext.folder_placeholder | translate"
+                [tooltip]="helptext.folder_tooltip | translate"
+                [required]="true"
+              ></ix-input>
+            } @else {
+              <ix-explorer
+                formControlName="folder"
+                root="/"
+                [label]="helptext.folder_placeholder | translate"
+                [tooltip]="helptext.folder_tooltip | translate"
+                [nodeProvider]="bucketNodeProvider"
+                [required]="true"
+              ></ix-explorer>
+            }
           }
         </ix-fieldset>
         <ix-fieldset
diff --git a/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.ts b/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.ts
index ee3c38d94ee..dee6731f246 100644
--- a/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.ts
+++ b/src/app/pages/data-protection/cloud-backup/cloud-backup-form/cloud-backup-form.component.ts
@@ -43,6 +43,10 @@ export class CloudBackupFormComponent implements OnInit {
     return !this.editingTask;
   }
 
+  get isNewBucketOptionSelected(): boolean {
+    return this.form.value.bucket === newOption;
+  }
+
   get title(): string {
     return this.isNew
       ? this.translate.instant('Add TrueCloud Backup Task')
@@ -245,7 +249,7 @@ export class CloudBackupFormComponent implements OnInit {
     this.isLoading = true;
 
     let createBucket$: Observable<unknown> = of(null);
-    if (!!this.form.value.bucket_input && this.form.value.bucket === newOption) {
+    if (!!this.form.value.bucket_input && this.isNewBucketOptionSelected) {
       createBucket$ = this.ws.call('cloudsync.create_bucket', [this.form.value.credentials, this.form.value.bucket_input]);
     }
 
@@ -279,7 +283,7 @@ export class CloudBackupFormComponent implements OnInit {
   private prepareData(formValue: FormValue): CloudBackupUpdate {
     const attributes: CloudBackupUpdate['attributes'] = {
       folder: formValue.folder,
-      bucket: this.form.value.bucket_input && this.form.value.bucket === newOption
+      bucket: this.form.value.bucket_input && this.isNewBucketOptionSelected
         ? this.form.value.bucket_input
         : formValue.bucket,
     };