diff --git a/src/views/toolbar/me/ToolbarMeView.tsx b/src/views/toolbar/me/ToolbarMeView.tsx
index d1128da7..510e68ef 100644
--- a/src/views/toolbar/me/ToolbarMeView.tsx
+++ b/src/views/toolbar/me/ToolbarMeView.tsx
@@ -1,4 +1,6 @@
-import { FC } from 'react';
+import { RoomObjectCategory } from '@nitrots/nitro-renderer';
+import { FC, useEffect } from 'react';
+import { GetRoomEngine, GetRoomSession } from '../../../api';
 import { ToolbarViewItems } from '../ToolbarView.types';
 import { ToolbarMeViewProps } from './ToolbarMeView.types';
 
@@ -6,6 +8,15 @@ export const ToolbarMeView: FC<ToolbarMeViewProps> = props =>
 {
     const { unseenAchievementCount = 0, handleToolbarItemClick = null } = props;
 
+    useEffect(() =>
+    {
+        const roomSession = GetRoomSession();
+
+        if(!roomSession) return;
+
+        GetRoomEngine().selectRoomObject(roomSession.roomId, roomSession.ownRoomIndex, RoomObjectCategory.UNIT);
+    }, []);
+
     return (
         <div className="d-flex nitro-toolbar-me px-1 py-2">
             <div className="navigation-items">