diff --git a/src/app/submission/sections/upload/file/file.component.html b/src/app/submission/sections/upload/file/file.component.html
index ffbaefaa0e..5db4843bf7 100644
--- a/src/app/submission/sections/upload/file/file.component.html
+++ b/src/app/submission/sections/upload/file/file.component.html
@@ -8,7 +8,7 @@
       <div class="float-left w-75">
         <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
       </div>
-      <div class="float-right w-15">
+      <div class="float-right w-15" [class.sticky-buttons]="!readMode">
         <ng-container *ngIf="readMode">
           <button class="btn btn-link" (click)="downloadBitstreamFile(); $event.stopPropagation()"><i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i></button>
           <!--<a href="{{fileData.url}}"  title="Download file" target="_blank"><i class="fa fa-download text-normal mr-3" aria-hidden="true"></i></a>-->
diff --git a/src/app/submission/sections/upload/file/file.component.scss b/src/app/submission/sections/upload/file/file.component.scss
new file mode 100644
index 0000000000..754ce62835
--- /dev/null
+++ b/src/app/submission/sections/upload/file/file.component.scss
@@ -0,0 +1,8 @@
+@import '../../../../../styles/variables';
+
+.sticky-buttons {
+  position: sticky;
+  top: 72px;
+  z-index: $submission-footer-z-index;
+  background-color: rgba($white, .97);
+}
diff --git a/src/app/submission/sections/upload/file/file.component.ts b/src/app/submission/sections/upload/file/file.component.ts
index c3b18a711f..fc63e35c41 100644
--- a/src/app/submission/sections/upload/file/file.component.ts
+++ b/src/app/submission/sections/upload/file/file.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnChanges, OnInit } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { SectionUploadService } from '../section-upload.service';
 import { isNotEmpty, isNotNull, isNotUndefined } from '../../../../shared/empty.util';
@@ -20,6 +20,7 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
 
 @Component({
   selector: 'ds-submission-upload-section-file',
+  styleUrls: ['./file.component.scss'],
   templateUrl: './file.component.html',
 })
 export class UploadSectionFileComponent implements OnChanges, OnInit {
@@ -122,7 +123,7 @@ export class UploadSectionFileComponent implements OnChanges, OnInit {
           const accessConditionsToSave = [];
           formData.accessConditions
             .filter((accessCondition) => isNotEmpty(accessCondition))
-            .forEach((accessCondition, index) => {
+            .forEach((accessCondition) => {
               let accessConditionOpt;
 
               this.availableAccessConditionOptions
@@ -130,7 +131,7 @@ export class UploadSectionFileComponent implements OnChanges, OnInit {
                 .forEach((element) => accessConditionOpt = element);
 
               if (accessConditionOpt) {
-                const path = `accessConditions/${index}`;
+
                 if (accessConditionOpt.hasStartDate !== true && accessConditionOpt.hasEndDate !== true) {
                   accessConditionOpt = deleteProperty(accessConditionOpt, 'hasStartDate');