diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0e1044ac651ec31ebd7d38d288ab52741aaea25c..013d61a50fb20571111629b167455add3337bbdf 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -548,6 +548,10 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
         this.router.navigate(["/diagram"]);
     }
 
+    public toNotes() {
+        this.router.navigate(["/properties"]);
+    }
+
     public toCalc(id: string) {
         this.router.navigate(["/calculator", id]);
         this.setActiveCalc(id);
@@ -624,9 +628,13 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
                         this.notificationsService.notify(this.intlService.localizeText("WARNING_SESSION_LOAD_NOTES_MERGED"), 3500);
                     }
                     // go to calc or diagram depending on what was loaded
-                    if (data.loaded.length > 1) {
-                        this.toDiagram();
-                    } else {
+                    if (data.loaded.length > 1 && currentNotes) {
+                        this.toNotes();
+                    }
+                    else if(data.loaded.length > 1 && !currentNotes) {
+                        this.toDiagram()
+                    }
+                     else {
                         this.toCalc(data.loaded[0]);
                     }
                 }