diff --git a/lib/models/native_model.dart b/lib/models/native_model.dart
index eadf10633..d2c83d7f2 100644
--- a/lib/models/native_model.dart
+++ b/lib/models/native_model.dart
@@ -124,6 +124,7 @@ class PlatformFFI {
   }
 
   static invokeMethod(String method,[ dynamic arguments ]) async {
+    if (!isAndroid) return Future<bool>(() => false);
     return await toAndroidChannel.invokeMethod(method,arguments);
   }
 }
diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart
index 3bcd8fbc9..410d8f1fb 100644
--- a/lib/pages/chat_page.dart
+++ b/lib/pages/chat_page.dart
@@ -244,48 +244,50 @@ class _ChatWindowOverlayState extends State<ChatWindowOverlay> {
         left: _o.dx,
         width: widget.windowWidth,
         height: widget.windowHeight,
-        child: Scaffold(
-          resizeToAvoidBottomInset: false,
-          appBar: CustomAppBar(
-            onPanUpdate: (d) => changeOffset(d.delta),
-            appBar: Container(
-              color: MyTheme.accent50,
-              height: 50,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 15),
-                      child: Text(
-                        translate("Chat"),
-                        style: TextStyle(
-                            color: Colors.white,
-                            fontFamily: 'WorkSans',
-                            fontWeight: FontWeight.bold,
-                            fontSize: 20),
-                      )),
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      IconButton(
-                          onPressed: () {
-                            hideChatWindowOverlay();
-                          },
-                          icon: Icon(Icons.keyboard_arrow_down)),
-                      IconButton(
-                          onPressed: () {
-                            hideChatWindowOverlay();
-                            hideChatIconOverlay();
-                          },
-                          icon: Icon(Icons.close))
-                    ],
-                  )
-                ],
-              ),
-            ),
-          ),
-          body: chatPage,
-        ));
+        child: isIOS
+            ? chatPage
+            : Scaffold(
+                resizeToAvoidBottomInset: false,
+                appBar: CustomAppBar(
+                  onPanUpdate: (d) => changeOffset(d.delta),
+                  appBar: Container(
+                    color: MyTheme.accent50,
+                    height: 50,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Padding(
+                            padding: EdgeInsets.symmetric(horizontal: 15),
+                            child: Text(
+                              translate("Chat"),
+                              style: TextStyle(
+                                  color: Colors.white,
+                                  fontFamily: 'WorkSans',
+                                  fontWeight: FontWeight.bold,
+                                  fontSize: 20),
+                            )),
+                        Row(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: [
+                            IconButton(
+                                onPressed: () {
+                                  hideChatWindowOverlay();
+                                },
+                                icon: Icon(Icons.keyboard_arrow_down)),
+                            IconButton(
+                                onPressed: () {
+                                  hideChatWindowOverlay();
+                                  hideChatIconOverlay();
+                                },
+                                icon: Icon(Icons.close))
+                          ],
+                        )
+                      ],
+                    ),
+                  ),
+                ),
+                body: chatPage,
+              ));
   }
 }
 
diff --git a/lib/pages/connection_page.dart b/lib/pages/connection_page.dart
index d40fb019f..282a98a3d 100644
--- a/lib/pages/connection_page.dart
+++ b/lib/pages/connection_page.dart
@@ -20,7 +20,7 @@ class ConnectionPage extends StatefulWidget implements PageShape {
   final title = translate("Connection");
 
   @override
-  final appBarActions = isWeb ? <Widget>[WebMenu()] : <Widget>[];
+  final appBarActions = !isAndroid ? <Widget>[WebMenu()] : <Widget>[];
 
   @override
   final scrollController = ScrollController();