diff --git a/Ferrite/Views/CommonViews/NavView.swift b/Ferrite/Views/CommonViews/NavView.swift
index fe2c172..6c8297b 100644
--- a/Ferrite/Views/CommonViews/NavView.swift
+++ b/Ferrite/Views/CommonViews/NavView.swift
@@ -14,18 +14,16 @@ struct NavView<Content: View>: View {
     @ViewBuilder var content: Content
 
     var body: some View {
-        // Uncomment once NavigationStack issues are fixed
-        /*
-         if #available(iOS 16, *) {
-             NavigationStack {
-                 content
-             }
-         } else {
-          */
-        NavigationView {
-            content
+        // NavigationStack issues are fixed on iOS 17
+        if #available(iOS 17, *) {
+            NavigationStack {
+                content
+            }
+        } else {
+            NavigationView {
+                content
+            }
+            .navigationViewStyle(.stack)
         }
-        .navigationViewStyle(.stack)
-        // }
     }
 }