diff --git a/webextension/css/popup.css b/webextension/css/popup.css
index 3c8f79b..5d29b3d 100644
--- a/webextension/css/popup.css
+++ b/webextension/css/popup.css
@@ -242,3 +242,8 @@ table.unstriped tbody tr {
   padding-inline-start: 17px;
   padding-inline-end: 7px;
 }
+
+.scrollable {
+  overflow: auto;
+  max-height: 480px;
+}
diff --git a/webextension/popup.html b/webextension/popup.html
index 856f583..ab77756 100644
--- a/webextension/popup.html
+++ b/webextension/popup.html
@@ -33,9 +33,11 @@
         <a id="sort-containers-link"><img alt="Sort Containers" title="Sort Containers" class="icon" src="/img/container-sort.svg"></a>
       </div>
     </div>
-    <table class="unstriped">
-      <tbody class="identities-list"></tbody>
-    </table>
+    <div class="scrollable">
+      <table class="unstriped">
+        <tbody class="identities-list"></tbody>
+      </table>
+    </div>
     <div class="row panel-footer edit-identities">
       <div class="small-10 columns edit-containers-text">
         <a id="edit-containers-link">Edit Containers</a>
@@ -63,8 +65,10 @@
         <div class="row container-info-panel-movetabs container-info-has-tabs clickable" id="container-info-movetabs">
           Move tabs to a new window
         </div>
-        <table class="unstriped" id="container-info-table">
-        </table>
+        <div class="scrollable">
+          <table class="unstriped" id="container-info-table">
+          </table>
+        </div>
       </div>
     </div>
   </div>
@@ -76,9 +80,11 @@
         <h3 class="panel-header-text">Edit Containers</h3>
       </div>
     </div>
-    <table class="unstriped">
-      <tbody id="edit-identities-list"></tbody>
-    </table>
+    <div class="scrollable">
+      <table class="unstriped">
+        <tbody id="edit-identities-list"></tbody>
+      </table>
+    </div>
     <div class="row panel-footer edit-containers-panel-footer">
       <div class="small-10 columns edit-containers-exit-text">
         <a id="exit-edit-mode-link">&lt; Exit Edit Mode</a>