diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
index 2368c66bd4..f269e1beab 100644
--- a/frontend/src/css/layout.css
+++ b/frontend/src/css/layout.css
@@ -87,6 +87,10 @@
   min-height: 0;
 }
 
+.org-users-container div:last-child, .org-logs-container div:last-child {
+  height: calc(100% - 20px);
+}
+
 .cur-view-path {
   position: relative; /* for the ':after' */
   padding: 8px 16px;
diff --git a/frontend/src/pages/org-admin/org-logs.js b/frontend/src/pages/org-admin/org-logs.js
index 7487f5a204..edcff9f56a 100644
--- a/frontend/src/pages/org-admin/org-logs.js
+++ b/frontend/src/pages/org-admin/org-logs.js
@@ -15,7 +15,7 @@ class OrgLogs extends Component {
   render() {
     return (
       <div className="main-panel-center flex-row">
-        <div className="cur-view-container">
+        <div className="cur-view-container org-logs-container">
           <div className="cur-view-path org-user-nav">
             <ul className="nav">
               <li className="nav-item" onClick={() => this.tabItemClick('logadmin')}>
diff --git a/frontend/src/pages/org-admin/org-users.js b/frontend/src/pages/org-admin/org-users.js
index 1227beb2b8..dbb7221a64 100644
--- a/frontend/src/pages/org-admin/org-users.js
+++ b/frontend/src/pages/org-admin/org-users.js
@@ -15,7 +15,7 @@ class OrgUsers extends Component {
   render() {
     return (
       <div className="main-panel-center flex-row">
-        <div className="cur-view-container">
+        <div className="cur-view-container org-users-container">
           <div className="cur-view-path org-user-nav">
             <ul className="nav">
               <li className="nav-item" onClick={() => this.tabItemClick('users')}>