diff --git a/agaric/templates/form/container--no-parent.html.twig b/agaric/templates/form/container--no-parent.html.twig
new file mode 100644
index 0000000..f35eb26
--- /dev/null
+++ b/agaric/templates/form/container--no-parent.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override of a container used to wrap child elements.
+ *
+ * Used for grouped form items. Can also be used as a theme wrapper for any
+ * renderable element, to surround it with a <div> and HTML attributes.
+ * See \Drupal\Core\Render\Element\RenderElement for more
+ * information on the #theme_wrappers render array property, and
+ * \Drupal\Core\Render\Element\container for usage of the container render
+ * element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+     containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * Because stable's implementation only adds classes when the has_parent flag
+ * is true, we should be safe skipping the div when there's no parent.
+ */
+#}
+{{ children }}