diff --git a/CHANGES.txt b/CHANGES.txt
index 4495f12b..a2835df9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@ New in 3.2.1.4
 - FIX: Issue #842: Would it be possible to change a private to a protected?
 - FIX: Issue #843: Add an activity or resource popup display.
 - FIX: Issue #844: While adding images with floating submit buttons.
+- FIX: Issue #846: Group edit form layout.
 
 New in 3.2.1.3
 ==============
diff --git a/less/essential.less b/less/essential.less
index 4d44105e..bfe2662c 100644
--- a/less/essential.less
+++ b/less/essential.less
@@ -65,6 +65,7 @@
 @import "essential/question";
 @import "essential/search";
 @import "essential/tabs";
+@import "essential/user";
 // Load as last for potential overwrites.
 @import "essential/print";
 @import "essential/responsive";
diff --git a/less/essential/user.less b/less/essential/user.less
new file mode 100644
index 00000000..d3964e3a
--- /dev/null
+++ b/less/essential/user.less
@@ -0,0 +1,12 @@
+/* @group User */
+
+#groupeditform {
+    .groups,
+    .members {
+        display: inline-block;
+        float: none;
+        vertical-align: top;
+    }
+}
+
+/* @end */
\ No newline at end of file
diff --git a/style/essential.css b/style/essential.css
index 1e884ec7..30b08178 100644
--- a/style/essential.css
+++ b/style/essential.css
@@ -22912,6 +22912,14 @@ body.format-topcoll .course-content ul.ctopics li.section .content .toggle a h3:
   border: 1px solid #eee;
 }
 /* @end */
+/* @group User */
+#groupeditform .groups,
+#groupeditform .members {
+  display: inline-block;
+  float: none;
+  vertical-align: top;
+}
+/* @end */
 /* @group Print Styling */
 #printonly {
   display: none;