diff --git a/public/rcm-page-admin/plugin-drag.js b/public/rcm-page-admin/plugin-drag.js
index <HASH>..<HASH> 100644
--- a/public/rcm-page-admin/plugin-drag.js
+++ b/public/rcm-page-admin/plugin-drag.js
@@ -28,12 +28,16 @@ var RcmPluginDrag = {
                         }
                     }
                 );
-                for (var i = 0; i < extraRowCount; i++) {
-                    //do not add extra row at the bottom of GuestTopNav, causes issues
-                    if (container.attr('data-singleRowOnly') != 'Y') {
-                        container.append($('<div class="row"></div>'));
+                $.each(
+                    container, function () {
+                        for (var i = 0; i < extraRowCount; i++) {
+                            //do not add extra row at the bottom of GuestTopNav, causes issues
+                            if ($(this).closest('[singlerowonly]').length == 0) {
+                                container.append($('<div class="row"></div>'));
+                            }
+                        }
                     }
-                }
+                );
             }
         );
     },
Merge remote-tracking branch 'upstream/master' into responsiveThemefix

# Conflicts:
#	composer.lock