diff --git a/Cargo.lock b/Cargo.lock
index 527f65f4b..6b0029f9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2842,8 +2842,8 @@ dependencies = [
 
 [[package]]
 name = "sciter-rs"
-version = "0.5.56"
-source = "git+https://github.com/sciter-sdk/rust-sciter#d318df56eafe7800015c790f5880f6183551fdce"
+version = "0.5.53"
+source = "git+https://github.com/sciter-sdk/rust-sciter?rev=7702fb17290e76606bdd7010a0c3cbb32e85db76#7702fb17290e76606bdd7010a0c3cbb32e85db76"
 dependencies = [
  "lazy_static",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 9f6f4c2b4..16d306829 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ cpal = { git = "https://github.com/rustaudio/cpal" }
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 machine-uid = "0.2"
 mac_address = "1.1"
-sciter-rs = { git = "https://github.com/sciter-sdk/rust-sciter" }
+sciter-rs = { git = "https://github.com/sciter-sdk/rust-sciter", rev = "7702fb17290e76606bdd7010a0c3cbb32e85db76" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 systray = { path = "libs/systray-rs" }
diff --git a/src/ui/cm.tis b/src/ui/cm.tis
index a4cdfa543..d879ccaa0 100644
--- a/src/ui/cm.tis
+++ b/src/ui/cm.tis
@@ -246,7 +246,11 @@ function update() {
 
 function bring_to_top(idx=-1) {
     if (view.windowState == View.WINDOW_HIDDEN || view.windowState == View.WINDOW_MINIMIZED) {
-        view.windowState = View.WINDOW_SHOWN;
+        if (is_linux) {
+            view.focus = self;
+        } else {
+            view.windowState = View.WINDOW_SHOWN;
+        }
         if (idx >= 0) body.cur = idx;
     } else {
         view.windowTopmost = true;
diff --git a/src/ui/header.tis b/src/ui/header.tis
index b662934a9..26509720d 100644
--- a/src/ui/header.tis
+++ b/src/ui/header.tis
@@ -86,7 +86,7 @@ class Header: Reactor.Component {
         if (is_osx) style += "margin: *";
         self.timer(1ms, toggleMenuState);
         return <div style={style}>
-            {is_osx ? "" : <span #fullscreen>{svg_fullscreen}</span>}
+            {is_osx || is_xfce ? "" : <span #fullscreen>{svg_fullscreen}</span>}
             <div #screens>
                 <span #secure title={title_conn}>{icon_conn}</span>
                 <div .remote-id>{handler.get_id()}</div>
diff --git a/src/ui/remote.tis b/src/ui/remote.tis
index a447c98cd..7aa15aaff 100644
--- a/src/ui/remote.tis
+++ b/src/ui/remote.tis
@@ -10,6 +10,7 @@ var display_scale = 1;
 var keyboard_enabled = true; // server side
 var clipboard_enabled = true; // server side
 var audio_enabled = true; // server side
+var scroll_body = $(body);
 
 handler.setDisplay = function(x, y, w, h) {
     display_width = w;
@@ -166,7 +167,7 @@ function handler.onMouse(evt)
 {
     if (is_file_transfer || is_port_forward) return false;
     if (view.windowState == View.WINDOW_FULL_SCREEN && !dragging) {
-        if (evt.y < 10) {
+        if (evt.y - scroll_body.scroll(#top) < 10) {
             if (!wait_window_toolbar) {
                 wait_window_toolbar = true;
                 self.timer(300ms, function() {
@@ -392,7 +393,7 @@ handler.adaptSize = function() {
     size_adapted = true;
     var (sx, sy, sw, sh) = view.screenBox(#workarea, #rectw);
     var (fx, fy, fw, fh) = view.screenBox(#frame, #rectw);
-    workarea_offset = sy;
+    if (is_osx) workarea_offset = sy;
     var r = handler.get_size();
     if (r[2] > 0) {
         if (r[2] >= fw && r[3] >= fh) {