diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
index 95f5200cfff..cd0bce54ef4 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
@@ -18,13 +18,13 @@
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
 
 	<div class="box box-solid object-org-box" style="height: 100%; display: flex; flex-direction: column; flex-wrap: wrap;">
-		<div class="box-header with-border" wicket:id="treeHeader" style="flex: 1 1 26px;">
+		<div class="box-header with-border" wicket:id="treeHeader" style="flex: 1 1 26px; max-height: 41px;">
 			<h3 class="box-title"><div wicket:id="treeTitle"/></h3>
 			<div class="box-tools pull-right">
 				<div class="cog" wicket:id="treeMenu" about="treeMenu"/>
 			</div>
 		</div>
-		<div wicket:id="treeContainer" class="box-body org-tree-container" style="flex: 100 1 auto; max-height: 717px;">
+		<div wicket:id="treeContainer" class="box-body org-tree-container" style="flex: 100 1 auto; max-height: 92%;">
 			<div wicket:id="tree"/>
 		</div>
 	</div>	
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
index 7b820aaccbc..cb7ed0c4fa2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
@@ -21,7 +21,7 @@
         <!--  <div class="col-md-12 clearfix">
         </div>-->
         <div class="col-md-4">
-			<div style="max-height:800px; padding-bottom:20px;" wicket:id="treePanel"/>
+			<div style="height: 100%; max-height:800px; padding-bottom:20px;" wicket:id="treePanel"/>
         </div>
         <div class="col-md-8">
             <div class="box box-solid object-user-box org-managers-box" wicket:id="managerContainer">