diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py
index d23dd90915..04be97b747 100755
--- a/plugins/LayerView/LayerView.py
+++ b/plugins/LayerView/LayerView.py
@@ -112,7 +112,6 @@ class LayerView(View):
             self._layer_pass = LayerPass.LayerPass(1, 1)
             self._compatibility_mode = OpenGLContext.isLegacyOpenGL() or bool(Preferences.getInstance().getValue("view/force_layer_view_compatibility_mode"))
             self._layer_pass.setLayerView(self)
-            self.getRenderer().addRenderPass(self._layer_pass)
         return self._layer_pass
 
     def getCurrentLayer(self):
@@ -310,7 +309,8 @@ class LayerView(View):
 
         if event.type == Event.ViewActivateEvent:
             # Make sure the LayerPass is created
-            self.getLayerPass()
+            layer_pass = self.getLayerPass()
+            self.getRenderer().addRenderPass(layer_pass)
 
             Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
             self._onGlobalStackChanged()
@@ -335,6 +335,7 @@ class LayerView(View):
             if self._global_container_stack:
                 self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged)
 
+            self.getRenderer().removeRenderPass(self._layer_pass)
             self._composite_pass.setLayerBindings(self._old_layer_bindings)
             self._composite_pass.setCompositeShader(self._old_composite_shader)
 
diff --git a/plugins/XRayView/XRayView.py b/plugins/XRayView/XRayView.py
index ed8d14b8b4..35509a9715 100644
--- a/plugins/XRayView/XRayView.py
+++ b/plugins/XRayView/XRayView.py
@@ -56,7 +56,8 @@ class XRayView(View):
                 # Currently the RenderPass constructor requires a size > 0
                 # This should be fixed in RenderPass's constructor.
                 self._xray_pass = XRayPass.XRayPass(1, 1)
-                self.getRenderer().addRenderPass(self._xray_pass)
+
+            self.getRenderer().addRenderPass(self._xray_pass)
 
             if not self._xray_composite_shader:
                 self._xray_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("XRayView"), "xray_composite.shader"))
@@ -74,5 +75,6 @@ class XRayView(View):
             self._composite_pass.setCompositeShader(self._xray_composite_shader)
 
         if event.type == Event.ViewDeactivateEvent:
+            self.getRenderer().removeRenderPass(self._xray_pass)
             self._composite_pass.setLayerBindings(self._old_layer_bindings)
             self._composite_pass.setCompositeShader(self._old_composite_shader)
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 2fd19a8a03..fdb1380950 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -344,9 +344,6 @@ UM.MainWindow
             {
                 id: toolbar;
 
-                property int mouseX: base.mouseX
-                property int mouseY: base.mouseY
-
                 anchors {
                     top: openFileButton.bottom;
                     topMargin: UM.Theme.getSize("window_margin").height;
diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml
index 5dacfc72ea..c69c786d5a 100644
--- a/resources/qml/Topbar.qml
+++ b/resources/qml/Topbar.qml
@@ -30,9 +30,11 @@ Rectangle
     Component.onCompleted: {
         startMonitoringPrint.connect(function () {
             base.monitoringPrint = true
+            UM.Controller.disableModelRendering()
         })
         stopMonitoringPrint.connect(function () {
             base.monitoringPrint = false
+            UM.Controller.enableModelRendering()
         })
     }