diff --git a/core/modules/system/css/system.module.css b/core/modules/system/css/system.module.css
index 0359e4b..ced287a 100644
--- a/core/modules/system/css/system.module.css
+++ b/core/modules/system/css/system.module.css
@@ -105,6 +105,11 @@ tr.add-new .tabledrag-changed {
 a.tabledrag-handle:hover {
   text-decoration: none;
 }
+
+/* If inside of a collapsible table, float the handle to the right side */
+.responsive-enabled.is-collapsed a.tabledrag-handle {
+  float: right;
+}
 a.tabledrag-handle .handle {
   background: url(../../../misc/icons/787878/move.svg) no-repeat 6px 7px;
   height: 14px;
diff --git a/core/themes/seven/css/components/tables.css b/core/themes/seven/css/components/tables.css
index 56e77aa..47f5db9 100644
--- a/core/themes/seven/css/components/tables.css
+++ b/core/themes/seven/css/components/tables.css
@@ -176,5 +176,17 @@ th.select-all {
     width: 8em;
     display: inline-block;
   }
+
+  /* A few overrides to cover some edge cases. */
+  .responsive-enabled.is-collapsed .form-item {
+    display: inline-block;
+  }
+  .responsive-enabled.is-collapsed .dropbutton-wrapper {
+    width: auto;
+    display: inline-block
+  }
+  .touch .responsive-enabled.is-collapsed .draggable td {
+    padding: 10px 12px;
+  }
 }