diff --git a/src/components/FunctionalArea/FunctionalArea.component.tsx b/src/components/FunctionalArea/FunctionalArea.component.tsx
index d38bcd195aa44fcd1c7f18c3dd0c2f43dc912797..c45a2fe859fe268c8f0ae407a4b069ec6b77b280 100644
--- a/src/components/FunctionalArea/FunctionalArea.component.tsx
+++ b/src/components/FunctionalArea/FunctionalArea.component.tsx
@@ -10,7 +10,7 @@ export const FunctionalArea = (): JSX.Element => (
     <div className="absolute left-[88px] top-16 z-10 w-[calc(100%-88px)]">
       <MapNavigation />
     </div>
-    <div className="absolute left-0 top-16 z-10 flex h-[calc(100%-64px)]">
+    <div className="absolute left-0 top-16 z-10 flex h-[calc(100%-64px)] overflow-y-auto">
       <NavBar />
     </div>
   </>
diff --git a/src/components/Map/Drawer/AvailablePluginsDrawer/AvailablePluginsDrawer.component.tsx b/src/components/Map/Drawer/AvailablePluginsDrawer/AvailablePluginsDrawer.component.tsx
index 80af258edc647d357865948e2e52a9dc333dcaba..d092275920b566314aad7c8229e3f4b0383ed7f9 100644
--- a/src/components/Map/Drawer/AvailablePluginsDrawer/AvailablePluginsDrawer.component.tsx
+++ b/src/components/Map/Drawer/AvailablePluginsDrawer/AvailablePluginsDrawer.component.tsx
@@ -7,7 +7,7 @@ export const AvailablePluginsDrawer = (): JSX.Element => {
   return (
     <div className="h-full max-h-full" data-testid="available-plugins-drawer">
       <DrawerHeading title="Available plugins" />
-      <div className="flex flex-col gap-6 p-6">
+      <div className="flex h-[calc(100%-93px)] max-h-[calc(100%-93px)] flex-col gap-6 overflow-y-auto p-6">
         <LoadPluginFromUrl />
         <PrivateActivePlugins />
         <PublicPlugins />