diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index cef2fd276b..da7127fd48 100644
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -338,7 +338,7 @@ class SettingsDropdown extends PureComponent {
         icon: 'manage_layout',
         label: intl.formatMessage(intlMessages.layoutModal),
         onClick: () => this.setLayoutModalIsOpen(true),
-        divider: true,
+        divider: isDirectLeaveButtonEnabled ? false : true,
       },
     );