2 files changed, 18 insertions, 12 deletions

diff --git a/src/client/views/collections/CollectionSchemaView.scss b/src/client/views/collections/CollectionSchemaView.scss
index 75bf6610e..858d7859f 100644
--- a/src/client/views/collections/CollectionSchemaView.scss
+++ b/src/client/views/collections/CollectionSchemaView.scss
@@ -59,6 +59,7 @@
     justify-content: space-between;
     flex-wrap: nowrap;
     touch-action: none;
+    padding: 2px;
 
     div {
         touch-action: none;
@@ -165,6 +166,8 @@
         font-size: 13px;
         text-align: center;
         white-space: nowrap;
+        display: flex;
+        align-items: center;
 
         .imageBox-cont {
             position: relative;
@@ -183,6 +186,11 @@
             height: 100%;
         }
     }
+    .rt-td.rt-expandable {
+        display: flex;
+        align-items: center;
+        height: inherit;
+    }
 
     .rt-resizer {
         width: 8px;
@@ -427,7 +435,7 @@ button.add-column {
         //flex: 50 0 auto;
         width: 0;
         max-width: 50px;
-        height: 100%;
+        //height: 100%;
         min-height: 30px;
         align-items: center;
         color: lightgray;
@@ -471,7 +479,7 @@ button.add-column {
 
 .collectionSchemaView-cellContainer {
     width: 100%;
-    height: 100%;
+    height: unset;
 }
 
 .collectionSchemaView-cellWrapper {
@@ -608,10 +616,12 @@ button.add-column {
 .collectionSchemaView-table {
     width: 100%;
     height: 100%;
+    overflow: auto;
+    padding: 3px;
 }
 
 .rt-td.rt-expandable {
-    overflow:visible;
+    overflow: visible;
     position: relative;
     height:100%;
     z-index: 1;
@@ -620,17 +630,10 @@ button.add-column {
     background-color: rgb(252, 252, 252);
     width: 100%;
 
-
     .rt-thead {
         display: none;
     }
 
-    .collectionSchemaView-table {
-        border: solid 1px;
-        overflow: hidden;
-    }
-
-
     .row-dragger {
         background-color: rgb(252, 252, 252);
     }
@@ -640,7 +643,10 @@ button.add-column {
     }
 
     .collectionSchemaView-table {
-        width: 100%;
+        width: 100%; 
+        border: solid 1px;
+        overflow: visible;
+        padding: 0px;
     }
 }
 
diff --git a/src/client/views/collections/SchemaTable.tsx b/src/client/views/collections/SchemaTable.tsx
index 28242a5aa..2fe00a245 100644
--- a/src/client/views/collections/SchemaTable.tsx
+++ b/src/client/views/collections/SchemaTable.tsx
@@ -554,7 +554,7 @@ export class SchemaTable extends React.Component<SchemaTableProps> {
 
     render() {
         const preview = "";
-        return <div className="collectionSchemaView-table" style={{ overflow: this.props.Document._searchDoc ? undefined : "auto" }}
+        return <div className="collectionSchemaView-table"
             onPointerDown={this.props.onPointerDown} onClick={this.props.onClick} onWheel={e => this.props.active(true) && e.stopPropagation()}
             onDrop={e => this.props.onDrop(e, {})} onContextMenu={this.onContextMenu} >
             {this.reactTable}