Merge branch 'master' of github.com:budibase/budibase into test-api-unification

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.20.12",
+  "version": "2.20.13",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

packages/builder/src/pages/builder/app/[application]/_layout.svelte

@@ -69,11 +69,12 @@
   // brought back to the same screen.
   const topItemNavigate = path => () => {
     const activeTopNav = $layout.children.find(c => $isActive(c.path))
-    if (!activeTopNav) return
-    builderStore.setPreviousTopNavPath(
-      activeTopNav.path,
-      window.location.pathname
-    )
+    if (activeTopNav) {
+      builderStore.setPreviousTopNavPath(
+        activeTopNav.path,
+        window.location.pathname
+      )
+    }
     $goto($builderStore.previousTopNavPath[path] || path)
   }