diff --git a/source/app/ui/qml/TabUI.qml b/source/app/ui/qml/TabUI.qml
index eb3b2475b..460d303b4 100644
--- a/source/app/ui/qml/TabUI.qml
+++ b/source/app/ui/qml/TabUI.qml
@@ -1259,13 +1259,13 @@ Item
     {
         id: window
         section: "window"
-        property alias pluginX: pluginWindow.x
-        property alias pluginY: pluginWindow.y
+        property var pluginX
+        property var pluginY
         property var pluginWidth
         property var pluginHeight
         property var pluginMaximised
-        property alias pluginSplitSize: root.pluginSplitSize
-        property alias pluginPoppedOut: root.pluginPoppedOut
+        property int pluginSplitSize
+        property bool pluginPoppedOut: false
     }
 
     Preferences
@@ -1387,12 +1387,19 @@ Item
 
     function loadPluginWindowState()
     {
+        if(window.pluginPoppedOut === undefined)
+            return;
+
+        root.pluginPoppedOut = window.pluginPoppedOut;
+
         if(!window.pluginPoppedOut)
             return;
 
         if(window.pluginWidth !== undefined &&
            window.pluginHeight !== undefined)
         {
+            pluginWindow.x = window.pluginX;
+            pluginWindow.y = window.pluginY;
             pluginWindow.width = window.pluginWidth;
             pluginWindow.height = window.pluginHeight;
         }
@@ -1406,6 +1413,8 @@ Item
 
     function savePluginWindowState()
     {
+        window.pluginPoppedOut = root.pluginPoppedOut;
+
         if(!window.pluginPoppedOut)
             return;
 
@@ -1413,6 +1422,8 @@ Item
 
         if(!pluginWindow.maximised)
         {
+            window.pluginX = pluginWindow.x;
+            window.pluginY = pluginWindow.y;
             window.pluginWidth = pluginWindow.width;
             window.pluginHeight = pluginWindow.height;
         }
@@ -1540,10 +1551,10 @@ Item
 
     function togglePop()
     {
-        if(pluginWindow.visible)
-            popInPlugin();
+        if(root.pluginPoppedOut)
+            root.popInPlugin();
         else
-            popOutPlugin();
+            root.popOutPlugin();
     }
 
     function createPluginMenu(index, menu)