diff --git a/client/plugins/databasemanager/index.js b/client/plugins/databasemanager/index.js
index 9aa121d8..5c5781b5 100644
--- a/client/plugins/databasemanager/index.js
+++ b/client/plugins/databasemanager/index.js
@@ -206,13 +206,13 @@ class DatabaseManagerPlugin {
         __classPrivateFieldGet(this, _DatabaseManagerPlugin_mainContentContainer, "f").classList.add("dm-container");
         __classPrivateFieldGet(this, _DatabaseManagerPlugin_element, "f").appendChild(__classPrivateFieldGet(this, _DatabaseManagerPlugin_mainContentContainer, "f"));
         __classPrivateFieldSet(this, _DatabaseManagerPlugin_contentDiv1, document.createElement("div"), "f");
-        __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv1, "f").classList.add("dm-content-container");
+        __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv1, "f").classList.add("dm-content-container", "ol-scrollable");
         __classPrivateFieldGet(this, _DatabaseManagerPlugin_mainContentContainer, "f").appendChild(__classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv1, "f"));
         __classPrivateFieldSet(this, _DatabaseManagerPlugin_contentDiv2, document.createElement("div"), "f");
-        __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv2, "f").classList.add("dm-content-container");
+        __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv2, "f").classList.add("dm-content-container", "ol-scrollable");
         __classPrivateFieldGet(this, _DatabaseManagerPlugin_mainContentContainer, "f").appendChild(__classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv2, "f"));
         __classPrivateFieldSet(this, _DatabaseManagerPlugin_contentDiv3, document.createElement("div"), "f");
-        __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv3, "f").classList.add("dm-content-container");
+        __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv3, "f").classList.add("dm-content-container", "ol-scrollable");
         __classPrivateFieldGet(this, _DatabaseManagerPlugin_mainContentContainer, "f").appendChild(__classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv3, "f"));
         /* Create the database editors, which use the three divs created before */
         __classPrivateFieldSet(this, _DatabaseManagerPlugin_aircraftEditor, new airuniteditor_1.AirUnitEditor(__classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv1, "f"), __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv2, "f"), __classPrivateFieldGet(this, _DatabaseManagerPlugin_contentDiv3, "f")), "f");
diff --git a/client/plugins/databasemanager/src/databasemanagerplugin.ts b/client/plugins/databasemanager/src/databasemanagerplugin.ts
index 690beba5..44537f7e 100644
--- a/client/plugins/databasemanager/src/databasemanagerplugin.ts
+++ b/client/plugins/databasemanager/src/databasemanagerplugin.ts
@@ -89,15 +89,15 @@ export class DatabaseManagerPlugin implements OlympusPlugin {
         this.#element.appendChild(this.#mainContentContainer);
 
         this.#contentDiv1 = document.createElement("div");
-        this.#contentDiv1.classList.add("dm-content-container");
+        this.#contentDiv1.classList.add("dm-content-container", "ol-scrollable");
         this.#mainContentContainer.appendChild(this.#contentDiv1);
 
         this.#contentDiv2 = document.createElement("div");
-        this.#contentDiv2.classList.add("dm-content-container");
+        this.#contentDiv2.classList.add("dm-content-container", "ol-scrollable");
         this.#mainContentContainer.appendChild(this.#contentDiv2);
 
         this.#contentDiv3 = document.createElement("div");
-        this.#contentDiv3.classList.add("dm-content-container");
+        this.#contentDiv3.classList.add("dm-content-container", "ol-scrollable");
         this.#mainContentContainer.appendChild(this.#contentDiv3);
 
         /* Create the database editors, which use the three divs created before */
diff --git a/client/plugins/databasemanager/style.css b/client/plugins/databasemanager/style.css
index 094ddb22..0dfd2647 100644
--- a/client/plugins/databasemanager/style.css
+++ b/client/plugins/databasemanager/style.css
@@ -63,6 +63,8 @@
     display: flex;
     flex-direction: column;
     row-gap: 5px;
+    max-height: 100%;
+    padding: 10px;
 }
 
 @media (min-width: 1200px) {