diff --git a/lib/main.dart b/lib/main.dart
index 94a44e9..6e8f4bf 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -25,9 +25,6 @@ import 'package:adguard_home_manager/providers/servers_provider.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  SystemChrome.setPreferredOrientations(
-    [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]
-  );  
 
   if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
     setWindowMinSize(const Size(500, 500));
diff --git a/lib/screens/settings/dhcp/dhcp.dart b/lib/screens/settings/dhcp/dhcp.dart
index 461fd73..e9b35fb 100644
--- a/lib/screens/settings/dhcp/dhcp.dart
+++ b/lib/screens/settings/dhcp/dhcp.dart
@@ -816,28 +816,30 @@ class _DhcpWidgetState extends State<DhcpWidget> {
             return Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                Column(
-                  mainAxisSize: MainAxisSize.max,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Text(
-                        AppLocalizations.of(context)!.neededSelectInterface,
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                          fontSize: 22,
-                          color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5)
+                Flexible(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.max,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: Text(
+                          AppLocalizations.of(context)!.neededSelectInterface,
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            fontSize: 22,
+                            color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5)
+                          ),
                         ),
                       ),
-                    ),
-                    const SizedBox(height: 30),
-                    ElevatedButton(
-                      onPressed: selectInterface, 
-                      child: Text(AppLocalizations.of(context)!.selectInterface)
-                    ),
-                  ],
+                      const SizedBox(height: 30),
+                      ElevatedButton(
+                        onPressed: selectInterface, 
+                        child: Text(AppLocalizations.of(context)!.selectInterface)
+                      ),
+                    ],
+                  ),
                 ),
               ],
             );
diff --git a/lib/screens/settings/dns/dns.dart b/lib/screens/settings/dns/dns.dart
index 63982b1..55cfa19 100644
--- a/lib/screens/settings/dns/dns.dart
+++ b/lib/screens/settings/dns/dns.dart
@@ -79,8 +79,10 @@ class _DnsSettingsWidgetState extends State<DnsSettingsWidget> {
     final serversProvider = Provider.of<ServersProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
 
+    final width = MediaQuery.of(context).size.width;
+
     void navigate(Widget widget) {
-      if (!(Platform.isAndroid || Platform.isIOS)) {
+      if (width > 900 || !(Platform.isAndroid || Platform.isIOS)) {
         SplitView.of(context).push(widget);
       }
       else {
diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart
index 8981f86..3875293 100644
--- a/lib/screens/settings/settings.dart
+++ b/lib/screens/settings/settings.dart
@@ -87,9 +87,14 @@ class SettingsWidget extends StatelessWidget {
           trailing: trailing,
           onTap: () {
             appConfigProvider.setSelectedSettingsScreen(thisItem);
-            Navigator.of(context).push(
-              MaterialPageRoute(builder: (context) => screenToNavigate)
-            );
+            if (!(Platform.isIOS || Platform.isAndroid)) {
+              SplitView.of(context).setSecondary(screenToNavigate);
+            }
+            else {
+              Navigator.of(context).push(
+                MaterialPageRoute(builder: (context) => screenToNavigate)
+              );
+            }
           },
         );
       }