diff --git a/app/lib/bloc/document_bloc.dart b/app/lib/bloc/document_bloc.dart
index 35426017bfb9..26574ac9f7bb 100644
--- a/app/lib/bloc/document_bloc.dart
+++ b/app/lib/bloc/document_bloc.dart
@@ -466,6 +466,9 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
           .toList();
       canvas.scale(pixelRatio);
 
+      // Wait one frame
+      await Future.delayed(const Duration(milliseconds: 1));
+
       ViewPainter(
         current.document,
         transform: event.cameraTransform,
@@ -483,8 +486,10 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
       var currentRenderers = current.cameraViewport.unbakedElements;
       if (reset) {
         currentRenderers = current.renderers;
+      } else {
+        renderers.addAll(current.cameraViewport.bakedElements);
       }
-      currentRenderers
+      currentRenderers = currentRenderers
           .whereNot(
               (element) => invisibleLayers.contains(element.element.layer))
           .whereNot((element) => renderers.contains(element))
diff --git a/app/lib/views/view.dart b/app/lib/views/view.dart
index db288dd0fcae..86a4c23d199e 100644
--- a/app/lib/views/view.dart
+++ b/app/lib/views/view.dart
@@ -140,7 +140,15 @@ class _MainViewViewportState extends State<MainViewViewport> {
                             : Offset(-dx, -dy))
                         ..zoom(scale, pointerSignal.localPosition);
                     }
-                    _bake(cubit.state);
+                    final currentSize =
+                        context.read<TransformCubit>().state.size;
+                    Future.delayed(const Duration(milliseconds: 500), () {
+                      if (currentSize ==
+                              context.read<TransformCubit>().state.size &&
+                          currentSize != state.cameraViewport.scale) {
+                        _bake();
+                      }
+                    });
                   }
                 },
                 onPointerDown: (PointerDownEvent event) {
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 5822cb804348..92b5fd4e9c6d 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -51,7 +51,10 @@ module.exports = {
                     position: 'left'
                 },
                 {
-                    to: 'community',
+                    type: 'doc',
+                    docId: 'community',
+                    docsPluginId: 'community',
+                    position: 'left',
                     label: 'Community',
                 },
                 {
@@ -198,12 +201,6 @@ module.exports = {
         ],
     ],
     plugins: [
-        [
-            '@docusaurus/plugin-client-redirects',
-            {
-                redirects: redirects
-            },
-        ],
         [
             '@docusaurus/plugin-content-docs',
             {
@@ -211,7 +208,12 @@ module.exports = {
                 path: 'community',
                 routeBasePath: '/',
                 sidebarPath: require.resolve('./sidebarsCommunity.js')
-
+            },
+        ],
+        [
+            '@docusaurus/plugin-client-redirects',
+            {
+                redirects: redirects
             },
         ],
         [
@@ -241,5 +243,6 @@ module.exports = {
                 ],
             },
         ],
+        // Other tweaks
     ]
 };
diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
index fcae53494a96..263ab847cebe 100644
--- a/fastlane/metadata/android/en-US/changelogs/22.txt
+++ b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -7,4 +7,5 @@
 * Add tooltips on window buttons
 * Disable window buttons in full screen
 * Fix file system on web (Creating directory if not exist)#
-* Fix file system directory error
\ No newline at end of file
+* Fix file system directory error
+* Fix baking issues
\ No newline at end of file