diff --git a/frontend/web/components/BreadcrumbSeparator.tsx b/frontend/web/components/BreadcrumbSeparator.tsx
index 2bc80b325e95..9c94305f85e7 100644
--- a/frontend/web/components/BreadcrumbSeparator.tsx
+++ b/frontend/web/components/BreadcrumbSeparator.tsx
@@ -26,11 +26,9 @@ import { getStore } from 'common/store'
 import { getEnvironments } from 'common/services/useEnvironment'
 import classNames from 'classnames'
 import Button from './base/forms/Button'
-import { Link } from 'react-router-dom'
 import CreateOrganisationModal from './modals/CreateOrganisation'
 import { useHasPermission } from 'common/providers/Permission'
 import Constants from 'common/constants'
-import CreateProjectModal from './modals/CreateProject'
 
 type BreadcrumbSeparatorType = {
   hideDropdown?: boolean
@@ -305,6 +303,7 @@ const BreadcrumbSeparator: FC<BreadcrumbSeparatorType> = ({
           setOpen(false)
           setProjectSearch('')
           setOrganisationSearch('')
+          setHoveredOrganisation(AccountStore.getOrganisation())
         }}
         containerClassName={'p-0'}
         className={