diff --git a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm
index 8d979f6..dedc2e1 100644
--- a/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm
+++ b/LNPopupController/LNPopupController/Private/UIViewController+LNPopupSupportPrivate.mm
@@ -462,6 +462,17 @@ - (void)_ln_willTransitionToTraitCollection:(UITraitCollection *)newCollection w
 	}
 	
 	[self _ln_willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+	
+	if(@available(iOS 18.0, *))
+	{
+		if([self isKindOfClass:UITabBarController.class])
+		{
+			[coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+				static SEL sel = NSSelectorFromString(LNPopupHiddenString("_forceUpdateScrollViewIfNecessary"));
+				[self performSelector:sel];
+			}];
+		}
+	}
 }
 
 - (UIViewController*)_findAncestorParentPopupContainerController
diff --git a/LNPopupControllerExample/LNPopupControllerExample.xcodeproj/xcshareddata/xcschemes/LNPopupControllerExampleNoPopup.xcscheme b/LNPopupControllerExample/LNPopupControllerExample.xcodeproj/xcshareddata/xcschemes/LNPopupControllerExampleNoPopup.xcscheme
index 14a9386..3a3b565 100644
--- a/LNPopupControllerExample/LNPopupControllerExample.xcodeproj/xcshareddata/xcschemes/LNPopupControllerExampleNoPopup.xcscheme
+++ b/LNPopupControllerExample/LNPopupControllerExample.xcodeproj/xcshareddata/xcschemes/LNPopupControllerExampleNoPopup.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "9999"
-   version = "1.3">
+   version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -37,9 +37,11 @@
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
+      debugDocumentVersioning = "NO"
+      debugXPCServices = "NO"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES"
+      queueDebuggingEnabled = "No">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
diff --git a/LNPopupControllerExample/LNPopupControllerExample/MusicScene/DemoAlbumTableViewController.swift b/LNPopupControllerExample/LNPopupControllerExample/MusicScene/DemoAlbumTableViewController.swift
index f3aeca7..d44382f 100644
--- a/LNPopupControllerExample/LNPopupControllerExample/MusicScene/DemoAlbumTableViewController.swift
+++ b/LNPopupControllerExample/LNPopupControllerExample/MusicScene/DemoAlbumTableViewController.swift
@@ -117,7 +117,7 @@ class DemoAlbumTableViewController: UITableViewController {
     }
 
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-		#if LNPOPUP
+#if LNPOPUP
 		let popupContentController = DemoMusicPlayerController()
 		popupContentController.songTitle = titles[(indexPath as NSIndexPath).row]
 		popupContentController.albumTitle = subtitles[(indexPath as NSIndexPath).row]
@@ -131,7 +131,7 @@ class DemoAlbumTableViewController: UITableViewController {
 		tabBarController?.popupBar.tintColor = UIColor.label
 		tabBarController?.popupBar.progressViewStyle = .top
 		
-		#endif
+#endif
 		
 		tableView.deselectRow(at: indexPath, animated: true)
 	}
diff --git a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingColorsPageViewController.swift b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingColorsPageViewController.swift
index 7c73299..bd6e5c7 100644
--- a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingColorsPageViewController.swift
+++ b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingColorsPageViewController.swift
@@ -16,7 +16,7 @@ protocol Indexable {
 class _ScrollingColorsPageViewController<T: UIViewController & Indexable>: UIPageViewController, UIPageViewControllerDataSource {
     override func viewDidLoad() {
         super.viewDidLoad()
-		
+#if LNPOPUP
 		let useCompact = UserDefaults.settings.integer(forKey: .barStyle) == LNPopupBar.Style.compact.rawValue
 		
 		let gridBarButtonItem = UIBarButtonItem()
@@ -24,6 +24,7 @@ class _ScrollingColorsPageViewController<T: UIViewController & Indexable>: UIPag
 		popupItem.barButtonItems = [gridBarButtonItem]
 		
 		LNApplyTitleWithSettings(to: self)
+#endif
 		
 		dataSource = self
 		
diff --git a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingMapViewController.swift b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingMapViewController.swift
index 2122fd8..3138c8b 100644
--- a/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingMapViewController.swift
+++ b/LNPopupControllerExample/LNPopupControllerExample/TestingScene/ScrollingMapViewController.swift
@@ -12,6 +12,7 @@ class ScrollingMapViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+#if LNPOPUP
 		let useCompact = UserDefaults.settings.integer(forKey: .barStyle) == LNPopupBar.Style.compact.rawValue
 		
 		let gridBarButtonItem = UIBarButtonItem()
@@ -19,5 +20,6 @@ class ScrollingMapViewController: UIViewController {
 		popupItem.barButtonItems = [gridBarButtonItem]
 		
 		LNApplyTitleWithSettings(to: self)
+#endif
     }
 }