diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
index 9627249..f4719e6 100644
--- a/src/components/Footer.jsx
+++ b/src/components/Footer.jsx
@@ -285,8 +285,8 @@ export default class Footer extends Component {
 							<button
 								onClick={this.layoutBtnClickhandler.bind(this, 4)}
 								id="layoutBtn4"
-								class="mode-btn hint--top-left hint--rounded hide-in-file-mode hide-on-mobile"
-								aria-label={i18n._(t`Switch to full screen preview`)}
+								class="mode-btn hint--top-left hint--rounded hide-on-mobile"
+								aria-label={i18n._(t`Toggle full screen preview`)}
 							>
 								<svg viewBox="0 0 100 100">
 									<rect x="0" y="0" width="100" height="100" />
diff --git a/src/components/app.jsx b/src/components/app.jsx
index ff86dd2..8d9123f 100644
--- a/src/components/app.jsx
+++ b/src/components/app.jsx
@@ -735,6 +735,9 @@ export default class App extends Component {
 	}
 
 	layoutBtnClickHandler(layoutId) {
+		if (layoutId === this.state.currentLayoutMode) {
+			layoutId = 2;
+		}
 		this.saveSetting('layoutMode', layoutId);
 		trackEvent('ui', 'toggleLayoutClick', layoutId);
 		this.toggleLayout(layoutId);