diff --git a/src/application/gui/NavigationView.ts b/src/application/gui/NavigationView.ts
index ab28b27f..5dfe0e45 100644
--- a/src/application/gui/NavigationView.ts
+++ b/src/application/gui/NavigationView.ts
@@ -10,8 +10,9 @@ const TOOLS: [GuiTool, string][] = [
 ];
 
 export class NavigationView extends View {
-    element = create_el("div", "application_NavigationView");
-    height = 30;
+    readonly element = create_el("div", "application_NavigationView");
+
+    readonly height = 30;
 
     private buttons = new Map<GuiTool, ToolButton>(
         TOOLS.map(([value, text]) => [value, this.disposable(new ToolButton(value, text))]),
diff --git a/src/core/rendering/Renderer.ts b/src/core/rendering/Renderer.ts
index 47522055..27709740 100644
--- a/src/core/rendering/Renderer.ts
+++ b/src/core/rendering/Renderer.ts
@@ -41,7 +41,7 @@ export abstract class Renderer implements Disposable {
 
     private renderer = new WebGLRenderer({ antialias: true });
     private render_scheduled = false;
-    private render_stop_scheduled = false;
+    private animation_frame_handle?: number = undefined;
     private light = new HemisphereLight(0xffffff, 0x505050, 1.2);
     private controls_clock = new Clock();
 
@@ -81,11 +81,14 @@ export abstract class Renderer implements Disposable {
 
     start_rendering(): void {
         this.schedule_render();
-        requestAnimationFrame(this.call_render);
+        this.animation_frame_handle = requestAnimationFrame(this.call_render);
     }
 
     stop_rendering(): void {
-        this.render_stop_scheduled = true;
+        if (this.animation_frame_handle != undefined) {
+            cancelAnimationFrame(this.animation_frame_handle);
+            this.animation_frame_handle = undefined;
+        }
     }
 
     schedule_render = () => {
@@ -121,15 +124,10 @@ export abstract class Renderer implements Disposable {
 
         this.render_scheduled = false;
 
-        if (this.render_stop_scheduled) {
-            this.render_stop_scheduled = false;
-            return;
-        }
-
         if (should_render) {
             this.render();
         }
 
-        requestAnimationFrame(this.call_render);
+        this.animation_frame_handle = requestAnimationFrame(this.call_render);
     };
 }