diff --git a/apps/trading-e2e/src/integration/navbar.cy.ts b/apps/trading-e2e/src/integration/navbar.cy.ts
deleted file mode 100644
index 262478610..000000000
--- a/apps/trading-e2e/src/integration/navbar.cy.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-
-describe('Navbar', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.clearAllLocalStorage();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/');
-    cy.wait('@Markets');
-    cy.wait('@MarketsData');
-  });
-
-  const pages = [
-    { name: 'Markets', link: '#/markets/all' },
-    { name: 'Trading', link: '#/markets' },
-    { name: 'Portfolio', link: '#/portfolio' },
-  ];
-
-  describe('desktop view', () => {
-    pages.forEach(({ name, link }) => {
-      it(`${name} should be correctly rendered`, () => {
-        cy.get('nav')
-          .find(`a[data-testid=${name}]:visible`)
-          .then((element) => {
-            cy.wrap(element).click();
-            cy.location('hash').should('contain', link);
-          });
-      });
-    });
-
-    it('Resources dropdown should be correctly rendered', () => {
-      const resourceSelector = 'ul li:contains(Resources)';
-      ['Docs', 'Give Feedback'].forEach((text, index) => {
-        cy.get('nav').find(resourceSelector).contains('Resources').click();
-        cy.get('nav')
-          .find(resourceSelector)
-          .find('.navigation-content li')
-          .eq(index)
-          .find('a')
-          .then((element) => {
-            expect(element.attr('target')).to.eq('_blank');
-            expect(element.attr('href')).to.not.be.empty;
-            expect(element.text()).to.eq(text);
-          });
-      });
-    });
-
-    it('Disclaimer should be presented after choosing from menu', () => {
-      cy.get('nav')
-        .find('ul li:contains(Resources)')
-        .contains('Resources')
-        .click();
-      cy.getByTestId('Disclaimer').eq(0).click();
-      cy.location('hash').should('equal', '#/disclaimer');
-      cy.get('p').contains(
-        'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets.'
-      );
-    });
-  });
-
-  describe('mobile view', () => {
-    const viewportHeight = Cypress.config('viewportHeight');
-    const viewportWidth = Cypress.config('viewportWidth');
-    before(() => {
-      // a little hack to keep the viewport size between tests (cypress bug)
-      Cypress.config({
-        viewportWidth: 560,
-        viewportHeight: 890,
-      });
-      cy.viewport(560, 890);
-    });
-
-    describe('wallet drawer', () => {
-      it('wallet drawer should be correctly rendered', () => {
-        mockConnectWallet();
-        cy.connectVegaWallet(true);
-        cy.getByTestId('connect-vega-wallet-mobile').click();
-        cy.getByTestId('wallets-drawer').should('be.visible');
-        cy.getByTestId('wallets-drawer').within((el) => {
-          cy.wrap(el).get('button').contains('Disconnect').click();
-        });
-        cy.getByTestId('wallets-drawer').should('not.be.visible');
-      });
-    });
-
-    describe('menu drawer', () => {
-      pages.forEach(({ name, link }) => {
-        it(`${name} should be correctly rendered`, () => {
-          cy.getByTestId('button-menu-drawer').click();
-          cy.getByTestId('menu-drawer').should('be.visible');
-          cy.getByTestId('menu-drawer').within((el) => {
-            cy.wrap(el).getByTestId(name).click();
-            cy.location('hash').should('contain', link);
-          });
-        });
-      });
-
-      it('Menu drawer should not be visible until opened', () => {
-        cy.getByTestId('menu-drawer').should('not.be.visible');
-        cy.getByTestId('button-menu-drawer').click();
-        cy.getByTestId('menu-drawer').should('be.visible');
-        cy.getByTestId('button-menu-drawer').click();
-        cy.getByTestId('menu-drawer').should('not.be.visible');
-      });
-    });
-    after(() => {
-      // a little hack to keep the viewport size between tests (cypress bug)
-      Cypress.config({
-        viewportWidth,
-        viewportHeight,
-      });
-    });
-  });
-});
diff --git a/apps/trading/components/navbar/navbar.tsx b/apps/trading/components/navbar/navbar.tsx
index ba06ad193..a9b3a54db 100644
--- a/apps/trading/components/navbar/navbar.tsx
+++ b/apps/trading/components/navbar/navbar.tsx
@@ -60,6 +60,7 @@ export const Navbar = ({ children }: { children?: ReactNode }) => {
               openVegaWalletDialog();
             }
           }}
+          data-testid="navbar-mobile-wallet"
         >
           <span className="sr-only">{t('Wallet')}</span>
           <WalletIcon className="w-6" />
@@ -68,7 +69,7 @@ export const Navbar = ({ children }: { children?: ReactNode }) => {
           onClick={() => {
             setMenu((x) => (x === 'nav' ? null : 'nav'));
           }}
-          data-testid="navbar-burger"
+          data-testid="navbar-mobile-burger"
         >
           <span className="sr-only">{t('Menu')}</span>
           <BurgerIcon />
@@ -121,14 +122,14 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
   // otherwise always go to /markets/all
   const tradingPath = marketId
     ? Links[Routes.MARKET](marketId)
-    : Routes.MARKETS;
+    : Links[Routes.MARKET]('');
 
   return (
     <div className="lg:flex gap-3">
       <NavbarList>
         <NavbarItem>
           <NavbarTrigger>{envNameMapping[VEGA_ENV]}</NavbarTrigger>
-          <NavbarContent>
+          <NavbarContent data-testid="navbar-content-network-switcher">
             <ul className="lg:px-4 lg:py-2">
               {[Networks.MAINNET, Networks.TESTNET].map((n) => {
                 const url = VEGA_NETWORKS[n];
@@ -162,7 +163,7 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
         </NavbarItem>
         <NavbarItem>
           <NavbarTrigger>{t('Resources')}</NavbarTrigger>
-          <NavbarContent>
+          <NavbarContent data-testid="navbar-content-resources">
             <ul className="lg:px-4 lg:py-2">
               {DocsLinks?.NEW_TO_VEGA && (
                 <li>
@@ -274,9 +275,10 @@ const NavbarList = (props: N.NavigationMenuListProps) => {
 /**
  * Content that gets rendered when a sub section of the navbar is shown
  */
-const NavbarContent = ({ children }: { children: ReactNode }) => {
+const NavbarContent = (props: N.NavigationMenuContentProps) => {
   return (
     <N.Content
+      {...props}
       className={classNames(
         'lg:absolute lg:mt-2 pl-2 lg:pl-0 z-20 lg:min-w-[290px]',
         'lg:bg-vega-clight-800 lg:dark:bg-vega-cdark-800',
@@ -284,9 +286,7 @@ const NavbarContent = ({ children }: { children: ReactNode }) => {
       )}
       onPointerEnter={preventHover}
       onPointerLeave={preventHover}
-    >
-      {children}
-    </N.Content>
+    />
   );
 };
 
@@ -312,6 +312,7 @@ const NavbarLinkExternal = ({
           'hover:text-vega-clight-50 dark:hover:text-vega-cdark-50'
         )}
         onClick={onClick}
+        target="_blank"
       >
         <span>{children}</span>
         <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />