diff --git a/src/app/applications/application-add-edit/application-add-edit.component.html b/src/app/applications/application-add-edit/application-add-edit.component.html
index ee3cf2da..0a3cfeba 100644
--- a/src/app/applications/application-add-edit/application-add-edit.component.html
+++ b/src/app/applications/application-add-edit/application-add-edit.component.html
@@ -1,4 +1,4 @@
-<div class="top-container" *ngIf="application">
+<div class="top-container">
   <div class="container">
     <div class="title-container">
       <div class="title-container__title">
@@ -26,7 +26,7 @@ <h1><span class="text-muted">Crown land File: {{application['clFile']}} &nbsp;&r
   </div>
 </div>
   
-<div class="bottom-container" *ngIf="application">
+<div class="bottom-container">
   <div class="container">
     <form class="mb-3" #applicationForm="ngForm">
       <fieldset>
diff --git a/src/app/applications/application-add-edit/application-add-edit.component.ts b/src/app/applications/application-add-edit/application-add-edit.component.ts
index 48fd1bfc..7ce9c7e5 100644
--- a/src/app/applications/application-add-edit/application-add-edit.component.ts
+++ b/src/app/applications/application-add-edit/application-add-edit.component.ts
@@ -63,11 +63,11 @@ export class ApplicationAddEditComponent implements OnInit, OnDestroy {
     router.events.subscribe(event => {
       if (event instanceof NavigationEnd) {
         const url = router.parseUrl(router.url);
-        if (url.fragment) {
+        if (url && url.fragment) {
           // ensure element exists
-          const element = document.querySelector('#' + url.fragment);
+          const element = document.getElementById(url.fragment);
           if (element) {
-            document.getElementById(url.fragment).scrollIntoView();
+            element.scrollIntoView();
           }
         }
       }