diff --git a/bigbluebutton-html5/imports/ui/components/media/service.js b/bigbluebutton-html5/imports/ui/components/media/service.js
index d3bac4dfa2d201b5363504795d18183288c71791..9cea76a3c18e38171fbbd73146fe714237731079 100755
--- a/bigbluebutton-html5/imports/ui/components/media/service.js
+++ b/bigbluebutton-html5/imports/ui/components/media/service.js
@@ -69,4 +69,5 @@ export default {
   isVideoBroadcasting,
   toggleSwapLayout,
   shouldEnableSwapLayout,
+  getSwapLayout,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx
index 6c9842165a00392c50f82f20448cbd46809a1fc4..f8a335a64c6edb005dcc31051fbfd86ca66fdcc4 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/container.jsx
@@ -2,10 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withTracker } from 'meteor/react-meteor-data';
 import PresentationService from '/imports/ui/components/presentation/service';
+import MediaService from '/imports/ui/components/media/service';
 import PresentationToolbarService from './service';
 import PresentationToolbar from './component';
 
-
 const PresentationToolbarContainer = (props) => {
   const {
     currentSlideNum,
@@ -15,10 +15,12 @@ const PresentationToolbarContainer = (props) => {
     zoom,
     zoomChanger,
     fitToWidthHandler,
+    getSwapLayout
   } = props;
 
-  if (userIsPresenter) {
-    // Only show controls if user is presenter
+  if (userIsPresenter && !getSwapLayout) {
+    // Only show controls if user is presenter and layout isn't swapped
+
     return (
       <PresentationToolbar
         {...{
@@ -44,6 +46,7 @@ export default withTracker((params) => {
   } = data;
 
   return {
+    getSwapLayout: MediaService.getSwapLayout(),
     fitToWidthHandler: params.fitToWidthHandler,
     userIsPresenter: PresentationService.isPresenter(podId),
     numberOfSlides,