diff --git a/app/lib/features/geckoview/domain/repositories/tab.dart b/app/lib/features/geckoview/domain/repositories/tab.dart
index 7243746a..1025d4d9 100644
--- a/app/lib/features/geckoview/domain/repositories/tab.dart
+++ b/app/lib/features/geckoview/domain/repositories/tab.dart
@@ -256,6 +256,10 @@ class TabRepository extends _$TabRepository {
       final syncTabs =
           next.value.isNotEmpty || (previous?.value.isNotEmpty ?? false);
 
+      if (_previousTabId != null && !next.value.contains(_previousTabId)) {
+        _previousTabId = null;
+      }
+
       if (syncTabs) {
         await db.tabDao.syncTabs(retainTabIds: next.value);
       }
diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart
index 3c7a23a7..bd0e773a 100644
--- a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart
+++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart
@@ -49,6 +49,7 @@ class FeedSearch extends HookConsumerWidget {
 
     return MultiSliver(
       children: [
+        const SliverToBoxAdapter(child: Divider()),
         SliverToBoxAdapter(
           child: Padding(
             padding: const EdgeInsets.only(left: 16.0),
diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart
index 1ec69f7d..95720a83 100644
--- a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart
+++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart
@@ -65,6 +65,7 @@ class TabSearch extends HookConsumerWidget {
 
     return MultiSliver(
       children: [
+        const SliverToBoxAdapter(child: Divider()),
         SliverToBoxAdapter(
           child: Padding(
             padding: const EdgeInsets.only(left: 16.0),
diff --git a/app/lib/features/geckoview/features/tabs/features/vector_store/utils/markdown_document_splitter.dart b/app/lib/features/geckoview/features/tabs/features/vector_store/utils/markdown_document_splitter.dart
index 2b376a17..f41dff72 100644
--- a/app/lib/features/geckoview/features/tabs/features/vector_store/utils/markdown_document_splitter.dart
+++ b/app/lib/features/geckoview/features/tabs/features/vector_store/utils/markdown_document_splitter.dart
@@ -8,6 +8,7 @@ typedef DocumentParts = ({String mainDocumentId, List<Document> parts});
 List<Document> _mergeShortDocuments(
   List<Document> documents,
   int maxLength, {
+  // ignore: unused_element_parameter
   String separator = '\n',
   required Document Function(Document a, Document b) doMerge,
   int Function(String) lengthFunction = TextSplitter.defaultLengthFunction,
diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/lensai/flutter_mozilla_components/api/GeckoBrowserApiImpl.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/lensai/flutter_mozilla_components/api/GeckoBrowserApiImpl.kt
index af33847f..17915064 100644
--- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/lensai/flutter_mozilla_components/api/GeckoBrowserApiImpl.kt
+++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/lensai/flutter_mozilla_components/api/GeckoBrowserApiImpl.kt
@@ -89,10 +89,10 @@ class GeckoBrowserApiImpl : GeckoBrowserApi {
         synchronized(this) {
             if(!isGeckoInitialized) {
                 Log.addSink(AndroidLogSink())
-            }
 
-            setupGeckoEngine()
-            isGeckoInitialized = true
+                setupGeckoEngine()
+                isGeckoInitialized = true
+            }
         }
     }