diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 4239c9d2b3..44a7044e52 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -27,8 +27,14 @@
           class="alert">
           <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
         </ng-container>
-        <input class="form-control" formControlName="page" name="page" type="hidden" [value]="routeService.getPreviousUrl() | async"
-        />
+        <!-- <input class="form-control" readonly formControlName="page" name="page" type="text" [value]="routeService.getPreviousUrl() | async"/> -->
+        <div class="row">
+          <div class="control-group col-sm-12">
+            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+            <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
+            <p class="help-block">{{ 'info.feedback.page_help' | translate }}</p>
+          </div>
+        </div>
         <div class="row py-2">
           <div class="control-group col-sm-12 text-right">
             <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
@@ -37,4 +43,4 @@
       </fieldset>
     </form>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index d2fd9f3715..98bf9a3fd7 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -9,6 +9,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { AuthService } from '../../../core/auth/auth.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'ds-feedback-form',
@@ -35,7 +36,8 @@ export class FeedbackFormComponent implements OnInit {
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     private feedbackDataService: FeedbackDataService,
-    private authService: AuthService) {
+    private authService: AuthService,
+    private router: Router) {
   }
 
   /**
@@ -50,6 +52,9 @@ export class FeedbackFormComponent implements OnInit {
     });
 
     this.routeService.getPreviousUrl().subscribe((url: string) => {
+      if (!url) {
+        url = '/home';
+      }
       this.feedbackForm.patchValue({ page: url });
     });
 
@@ -59,10 +64,12 @@ export class FeedbackFormComponent implements OnInit {
    * Function to create the feedback from form values
    */
   createFeedback(): void {
+    const url = this.feedbackForm.value.page;
     this.feedbackDataService.create(this.feedbackForm.value).pipe(getFirstCompletedRemoteData()).subscribe((response: RemoteData<NoContent>) => {
       if (response.isSuccess) {
         this.notificationsService.success(this.translate.instant('info.feedback.create.success'));
         this.feedbackForm.reset();
+        this.router.navigateByUrl(url);
       }
     });
   }