diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml
index eac1071822..1600df6d4f 100644
--- a/plugins/PreviewStage/PreviewMain.qml
+++ b/plugins/PreviewStage/PreviewMain.qml
@@ -25,5 +25,6 @@ Item
         anchors.bottom: parent.bottom
         anchors.rightMargin: UM.Theme.getSize("thick_margin").width
         anchors.bottomMargin: UM.Theme.getSize("thick_margin").height
+        hasPreviewButton: false
     }
 }
\ No newline at end of file
diff --git a/resources/qml/ActionPanel/ActionPanelWidget.qml b/resources/qml/ActionPanel/ActionPanelWidget.qml
index af27adf604..4d61380c99 100644
--- a/resources/qml/ActionPanel/ActionPanelWidget.qml
+++ b/resources/qml/ActionPanel/ActionPanelWidget.qml
@@ -19,6 +19,8 @@ Item
     height: childrenRect.height
     visible: CuraApplication.platformActivity
 
+    property bool hasPreviewButton: true
+
     Rectangle
     {
         id: actionPanelWidget
@@ -47,6 +49,13 @@ Item
                 rightMargin: UM.Theme.getSize("thick_margin").width
             }
             sourceComponent: actionPanelWidget.outputAvailable ? outputProcessWidget : sliceProcessWidget
+            onLoaded:
+            {
+                if(actionPanelWidget.outputAvailable)
+                {
+                    loader.item.hasPreviewButton = base.hasPreviewButton;
+                }
+            }
         }
 
         Component
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index 63974d7f34..f4505c620c 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -19,6 +19,7 @@ Column
 
     spacing: UM.Theme.getSize("thin_margin").height
     property bool preSlicedData: PrintInformation.preSliced
+    property alias hasPreviewButton: previewStageShortcut.visible
 
     UM.I18nCatalog
     {
@@ -120,7 +121,6 @@ Column
             toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft
 
             onClicked: UM.Controller.setActiveStage("PreviewStage")
-            visible: UM.Controller.activeStage != null && UM.Controller.activeStage.stageId != "PreviewStage"
         }
 
         Cura.OutputDevicesActionButton