diff --git a/qml/AppControls2/RoundButton.qml b/qml/AppControls2/RoundButton.qml
index 71401ec..e2220f7 100644
--- a/qml/AppControls2/RoundButton.qml
+++ b/qml/AppControls2/RoundButton.qml
@@ -5,6 +5,7 @@ MouseArea {
     id: buttonMouseArea
     hoverEnabled: true
     property string buttonIcon: ""
+    property bool highlight: false
 
     StyleBackground {
         useStyleTransparent: false
@@ -18,6 +19,6 @@ MouseArea {
         anchors.centerIn: parent
         width: 16; height: width
         source: buttonIcon
-        highLight: mainWindow.isFullScreen
+        highLight: buttonMouseArea.highlight
     }
 }
diff --git a/qml/main.qml b/qml/main.qml
index 4fb96cd..b333a21 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -74,10 +74,8 @@ Item {
         anchors.left: parent.left
         anchors.bottom: parent.bottom
         radius: 12
+        state: mainWindow.isFullScreen ? "fullScreen" : "normalScreen"
 
-        Component.onCompleted: {
-            state = mainWindow.isFullScreen ? "fullScreen" : "normalScreen"
-        }
         onHeightChanged:  {
             if (root.transparency <= 0.6 && root.onComlpeted) {
                 mainWindow.changeWindowBlurRegion(0, root.height - height, width, height)