diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
index cdb6d653bbdd..966d72f81e51 100644
--- a/core/src/main/resources/lib/form/hetero-list.jelly
+++ b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -87,8 +87,8 @@ THE SOFTWARE.
             <div colspan="3">
               <div class="${attrs.disableDragAndDrop or readOnlyMode ? '' : 'dd-handle'}">
                 <b>${descriptor.displayName}</b>
-                <f:helpLink url="${help}"/>
               </div>
+              <f:helpLink url="${help}"/>
             </div>
           </div>
           <!-- TODO: help support is unintuitive; people should be able to see help from drop-down menu -->
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index ff3002aab205..23d813246ef9 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -1280,6 +1280,14 @@ textarea.rich-editor {
 
 /* ========================= D&D support in heterogenous/repeatable lists = */
 
+.hetero-list-container .has-help {
+    display: flex;
+}
+
+.hetero-list-container .has-help .dd-handle {
+    flex: 1;
+}
+
 .hetero-list-container .dd-handle,
 .repeated-container .dd-handle {
     cursor: move;