diff --git a/frontend-v2/src/components/navigation/NavHeader.tsx b/frontend-v2/src/components/navigation/NavHeader.tsx
index f87afb5f3..7412d3dcc 100644
--- a/frontend-v2/src/components/navigation/NavHeader.tsx
+++ b/frontend-v2/src/components/navigation/NavHeader.tsx
@@ -60,7 +60,7 @@ export default function NavHeader({
   const [isHoveringCopyButton, setIsHoveringCopyButton] = useState(false);
 
   const routerEnvSlug = useParams({
-    from: ROUTE_PATHS.SecretDashboardPage.id,
+    strict: false,
     select: (el) => el.envSlug
   });
 
@@ -125,7 +125,7 @@ export default function NavHeader({
           </div>
         </>
       )}
-      {isFolderMode && Boolean(secretPathSegments.length) && (
+      {isFolderMode && routerEnvSlug && Boolean(secretPathSegments.length) && (
         <div className="flex items-center space-x-3">
           <FontAwesomeIcon icon={faAngleRight} className="ml-3 mr-1.5 text-xs text-gray-400" />
           <Link
diff --git a/frontend-v2/src/main.tsx b/frontend-v2/src/main.tsx
index 1ff8f55ef..63da66a78 100644
--- a/frontend-v2/src/main.tsx
+++ b/frontend-v2/src/main.tsx
@@ -27,7 +27,15 @@ const router = createRouter({
   )
 });
 
-router.subscribe("onBeforeLoad", ({ pathChanged }) => pathChanged && NProgress.start());
+router.subscribe("onBeforeLoad", ({ pathChanged }) => {
+  if (pathChanged) {
+    NProgress.start();
+    const timer = setTimeout(() => {
+      clearTimeout(timer);
+      NProgress.done();
+    }, 3000);
+  }
+});
 router.subscribe("onLoad", () => NProgress.done());
 // Register the router instance for type safety
 declare module "@tanstack/react-router" {
diff --git a/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx b/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx
index 46f60858a..e14c7bd6f 100644
--- a/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx
+++ b/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx
@@ -12,7 +12,7 @@ export const navigateUserToOrg = async (navigate: NavigateFn, organizationId?: s
 
   if (organizationId) {
     localStorage.setItem("orgData.id", organizationId);
-    navigate({ to: `/org/${organizationId}/overview` });
+    navigate({ to: "/organization/secret-manager/overview" });
     return;
   }
 
@@ -33,18 +33,14 @@ export const useNavigateToSelectOrganization = () => {
   const navigate = useNavigate();
 
   const navigateToSelectOrganization = async (cliCallbackPort?: string) => {
-    let redirectTo = "/login/select-organization?";
-    if (config.defaultAuthOrgId) {
-      redirectTo += `org_id=${config.defaultAuthOrgId}&`;
-    } else {
+    if (!config.defaultAuthOrgId) {
       queryClient.invalidateQueries({ queryKey: userKeys.getUser });
     }
 
-    if (cliCallbackPort) {
-      redirectTo += `callback_port=${cliCallbackPort}`;
-    }
-
-    navigate({ to: redirectTo });
+    navigate({
+      to: "/login/select-organization",
+      search: { callback_port: cliCallbackPort, org_id: config.defaultAuthOrgId }
+    });
   };
 
   return { navigateToSelectOrganization };
diff --git a/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx b/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
index 6fa659c5f..a2bfd6c8b 100644
--- a/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+++ b/frontend-v2/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
@@ -143,6 +143,7 @@ const Page = () => {
   const [debouncedSearchFilter, setDebouncedSearchFilter] = useDebounce(filter.searchFilter);
   const [filterHistory, setFilterHistory] = useState<Map<string, Filter>>(new Map());
 
+  // TODO(rbr): check why this fails
   const createSecretPopUp = usePopUpState(PopUpNames.CreateSecretForm);
   const { togglePopUp } = usePopUpAction();