diff --git a/src/views/achievements/AchievementsView.tsx b/src/views/achievements/AchievementsView.tsx
index 892bca9d..a60d0638 100644
--- a/src/views/achievements/AchievementsView.tsx
+++ b/src/views/achievements/AchievementsView.tsx
@@ -40,7 +40,7 @@ export const AchievementsView: FC<AchievementsViewProps> = props =>
         <AchievementsContextProvider value={ { achievementsState, dispatchAchievementsState } }>
             <AchievementsMessageHandler />
             { isVisible &&
-                <NitroCardView className="nitro-achievements">
+                <NitroCardView uniqueKey="achievements" className="nitro-achievements">
                     <NitroCardHeaderView headerText={ LocalizeText('inventory.achievements') } onCloseClick={ event => setIsVisible(false) } />
                     <NitroCardContentView>
                         <div className="row">
diff --git a/src/views/avatar-editor/AvatarEditorView.tsx b/src/views/avatar-editor/AvatarEditorView.tsx
index be5ea7df..e9f14a43 100644
--- a/src/views/avatar-editor/AvatarEditorView.tsx
+++ b/src/views/avatar-editor/AvatarEditorView.tsx
@@ -276,7 +276,7 @@ export const AvatarEditorView: FC<AvatarEditorViewProps> = props =>
     if(!isVisible || !figureData) return null;
 
     return (
-        <NitroCardView className="nitro-avatar-editor">
+        <NitroCardView uniqueKey="avatar-editor" className="nitro-avatar-editor">
             <NitroCardHeaderView headerText={ LocalizeText('avatareditor.title') } onCloseClick={ event => setIsVisible(false) } />
             <NitroCardTabsView>
                 { categories && (categories.size > 0) && Array.from(categories.keys()).map(category =>
diff --git a/src/views/catalog/CatalogView.tsx b/src/views/catalog/CatalogView.tsx
index 008e0c06..736be0de 100644
--- a/src/views/catalog/CatalogView.tsx
+++ b/src/views/catalog/CatalogView.tsx
@@ -190,7 +190,7 @@ export const CatalogView: FC<CatalogViewProps> = props =>
         <CatalogContextProvider value={ { catalogState, dispatchCatalogState } }>
             <CatalogMessageHandler />
             { isVisible &&
-                <NitroCardView className="nitro-catalog">
+                <NitroCardView uniqueKey="catalog" className="nitro-catalog">
                     <NitroCardHeaderView headerText={ LocalizeText('catalog.title') } onCloseClick={ event => { saveActivePages(); setIsVisible(false); } } />
                     <NitroCardTabsView>
                         { root && root.children.length && root.children.map((page, index) =>
diff --git a/src/views/friend-list/FriendListView.tsx b/src/views/friend-list/FriendListView.tsx
index 8430cc5f..0163d7cd 100644
--- a/src/views/friend-list/FriendListView.tsx
+++ b/src/views/friend-list/FriendListView.tsx
@@ -84,7 +84,7 @@ export const FriendListView: FC<FriendListViewProps> = props =>
             <FriendListMessageHandler />
             { isReady && createPortal(<FriendBarView />, document.getElementById('toolbar-friend-bar-container')) }
             { isVisible &&
-                <NitroCardView className="nitro-friend-list">
+                <NitroCardView uniqueKey="friend-list" className="nitro-friend-list">
                     <NitroCardHeaderView headerText={ LocalizeText('friendlist.friends') } onCloseClick={ event => setIsVisible(false) } />
                     <NitroCardContentView>
                         <div className="text-black fw-bold">{ LocalizeText('friendlist.search.friendscaption') }</div>
diff --git a/src/views/inventory/InventoryView.tsx b/src/views/inventory/InventoryView.tsx
index 3a337c29..91369e35 100644
--- a/src/views/inventory/InventoryView.tsx
+++ b/src/views/inventory/InventoryView.tsx
@@ -197,7 +197,7 @@ export const InventoryView: FC<InventoryViewProps> = props =>
         <InventoryContextProvider value={ { furnitureState, dispatchFurnitureState, botState, dispatchBotState, petState, dispatchPetState, badgeState, dispatchBadgeState, unseenTracker } }>
             <InventoryMessageHandler />
             { isVisible &&
-                <NitroCardView className="nitro-inventory">
+                <NitroCardView uniqueKey={ 'inventory' } className="nitro-inventory">
                     <NitroCardHeaderView headerText={ LocalizeText('inventory.title') } onCloseClick={ close } />
                     { !furnitureState.tradeData &&
                         <>
diff --git a/src/views/mod-tools/ModToolsView.tsx b/src/views/mod-tools/ModToolsView.tsx
index 132f19f4..54f759d0 100644
--- a/src/views/mod-tools/ModToolsView.tsx
+++ b/src/views/mod-tools/ModToolsView.tsx
@@ -161,7 +161,7 @@ export const ModToolsView: FC<ModToolsViewProps> = props =>
     return (
         <ModToolsContextProvider value={ { modToolsState, dispatchModToolsState } }>
             { isVisible &&
-                <NitroCardView className="nitro-mod-tools" simple={ true }>
+                <NitroCardView uniqueKey="mod-tools" className="nitro-mod-tools" simple={ true }>
                     <NitroCardHeaderView headerText={ "Mod Tools" } onCloseClick={ event => setIsVisible(false) } />
                     <NitroCardContentView className="text-black">
                         <button className="btn btn-primary w-100 mb-2" onClick={ () => handleClick('toggle_room') } disabled={ !currentRoomId }><i className="fas fa-home"></i> Room Tool</button>
diff --git a/src/views/navigator/NavigatorView.tsx b/src/views/navigator/NavigatorView.tsx
index a64bf81a..62a60ab9 100644
--- a/src/views/navigator/NavigatorView.tsx
+++ b/src/views/navigator/NavigatorView.tsx
@@ -139,7 +139,7 @@ export const NavigatorView: FC<NavigatorViewProps> = props =>
         <NavigatorContextProvider value={ { navigatorState, dispatchNavigatorState } }>
             <NavigatorMessageHandler />
             { isVisible &&
-                <NitroCardView className="nitro-navigator">
+                <NitroCardView uniqueKey="navigator" className="nitro-navigator">
                     <NitroCardHeaderView headerText={ LocalizeText(isCreatorOpen ? 'navigator.createroom.title' : 'navigator.title') } onCloseClick={ event => setIsVisible(false) } />
                     <NitroCardTabsView>
                         { topLevelContexts.map((context, index) =>