2 files changed, 11 insertions, 8 deletions
diff --git a/src/client/views/collections/CollectionSchemaView.scss b/src/client/views/collections/CollectionSchemaView.scss
index 74aa20e8b..0bd5a2ed3 100644
--- a/src/client/views/collections/CollectionSchemaView.scss
+++ b/src/client/views/collections/CollectionSchemaView.scss
@@ -38,6 +38,7 @@
         }
         .rt-tr-group {
             direction: ltr;
+            max-height: 44px;
         }
         .rt-td {
             border-width: 1;
@@ -61,13 +62,13 @@
             background:grey;
         }
     .ReactTable .rt-th, .ReactTable .rt-td {
-        max-height: 75px;
+        max-height: 44;
+        padding: 3px 7px;
     }
     .ReactTable .rt-tbody .rt-tr-group:last-child {
         border-bottom: grey;
         border-bottom-style: solid;
         border-bottom-width: 1;
-        height: auto;
     }
     .documentView-node:first-child {
         background: grey;
diff --git a/src/client/views/collections/CollectionSchemaView.tsx b/src/client/views/collections/CollectionSchemaView.tsx
index d5b82cbb6..38217d7c4 100644
--- a/src/client/views/collections/CollectionSchemaView.tsx
+++ b/src/client/views/collections/CollectionSchemaView.tsx
@@ -61,12 +61,14 @@ export class CollectionSchemaView extends CollectionViewBase {
             document.removeEventListener('pointerup', onRowUp);
         });
         let onRowDown = (e: React.PointerEvent) => {
-            if (e.shiftKey) {
-                CollectionDockingView.Instance.StartOtherDrag(reference.current!, props.doc);
-                e.stopPropagation();
-            } else {
-                document.addEventListener("pointermove", onRowMove);
-                document.addEventListener('pointerup', onRowUp);
+            if (this.props.isSelected() || this.props.isTopMost) {
+                if (e.shiftKey) {
+                    CollectionDockingView.Instance.StartOtherDrag(reference.current!, props.doc);
+                    e.stopPropagation();
+                } else {
+                    document.addEventListener("pointermove", onRowMove);
+                    document.addEventListener('pointerup', onRowUp);
+                }
             }
         }
         return (