diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
index 1ba5fb481..645cbe1cb 100644
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -346,11 +346,8 @@ class _RemoteToolbarState extends State<RemoteToolbar> {
       );
       return Align(
         alignment: FractionalOffset(_fractionX.value, 0),
-        child: Visibility(
-          visible: _dragging.isFalse,
-          maintainSize: true,
-          maintainAnimation: true,
-          maintainState: true,
+        child: Offstage(
+          offstage: _dragging.isTrue,
           child: Material(
             elevation: _ToolbarTheme.elevation,
             shadowColor: MyTheme.color(context).shadow,