diff --git a/lib/components/adaptive_page_layout.dart b/lib/components/adaptive_page_layout.dart
index 5802528..218a5af 100644
--- a/lib/components/adaptive_page_layout.dart
+++ b/lib/components/adaptive_page_layout.dart
@@ -23,7 +23,7 @@ class AdaptivePageLayout extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return OrientationBuilder(builder: (context, orientation) {
-      if (orientation == Orientation.portrait || columnMode(context)) {
+      if (orientation == Orientation.portrait || !columnMode(context)) {
         if (primaryPage == FocusPage.FIRST) {
           return firstScaffold;
         } else {
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index 32cc0a5..156cd46 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -89,6 +89,7 @@ class _ChatListState extends State<ChatList> {
                 onPressed: () => setState(() => searchMode = false),
               )
             : null,
+        automaticallyImplyLeading: false,
         actions: searchMode
             ? null
             : <Widget>[