diff --git a/package-lock.json b/package-lock.json
index f8b9bcd2..2edfac9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "formio-sfds",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a30ab518..e963e3ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formio-sfds",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "description": "The Form.io theme for sf.gov",
   "module": "src/index.js",
   "browser": "dist/formio-sfds.standalone.js",
diff --git a/src/patch.js b/src/patch.js
index 96932d4e..b1520ea0 100644
--- a/src/patch.js
+++ b/src/patch.js
@@ -484,7 +484,7 @@ function userIsTranslating (opts) {
 }
 
 function toggleComponent () {
-  observe('[data-toggle-container]', {
+  observe(`.${WRAPPER_CLASS} [data-toggle-container]`, {
     add (el) {
       const ariaControl = el.querySelector('[aria-controls]')
 
diff --git a/src/templates/datagrid/form.ejs b/src/templates/datagrid/form.ejs
index 91167a2e..c43678c4 100644
--- a/src/templates/datagrid/form.ejs
+++ b/src/templates/datagrid/form.ejs
@@ -35,7 +35,7 @@
         class="datagrid-group-label">{{ctx.groups[index].label}}</td>
     </tr>
     {% } %}
-    <tr ref="{{ctx.datagridKey}}-row">
+    <tr ref="{{ctx.datagridKey}}-row" class="v-align-top">
       {% if (ctx.component.reorder) { %}
         <td>
           <button type="button" class="formio-drag-button btn btn-default fa fa-bars"></button>