diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index fbcc6616183b44b3a8250c85c8b486803248f28b..b275b463f6cfaf868e03befa4699a017b2581d80 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -445,7 +445,10 @@ Blocks.defaultProps = {
 };
 
 const mapStateToProps = state => ({
-    anyModalVisible: Object.keys(state.scratchGui.modals).some(key => state.scratchGui.modals[key]),
+    anyModalVisible: (
+        Object.keys(state.scratchGui.modals).some(key => state.scratchGui.modals[key]) ||
+        state.scratchGui.mode.isFullScreen
+    ),
     extensionLibraryVisible: state.scratchGui.modals.extensionLibrary,
     locale: state.intl.locale,
     messages: state.intl.messages,
diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx
index c8d48a451b85f65472e76b6e60a60411b3dec43d..59e5b94268a5286b4a0ba94422819ed05a556a51 100644
--- a/src/containers/gui.jsx
+++ b/src/containers/gui.jsx
@@ -109,8 +109,10 @@ const mapStateToProps = state => ({
     isPlayerOnly: state.scratchGui.mode.isPlayerOnly,
     loadingStateVisible: state.scratchGui.modals.loadingProject,
     previewInfoVisible: state.scratchGui.modals.previewInfo,
-    targetIsStage: state.scratchGui.targets.stage &&
-    state.scratchGui.targets.stage.id === state.scratchGui.targets.editingTarget,
+    targetIsStage: (
+        state.scratchGui.targets.stage &&
+        state.scratchGui.targets.stage.id === state.scratchGui.targets.editingTarget
+    ),
     soundsTabVisible: state.scratchGui.editorTab.activeTabIndex === SOUNDS_TAB_INDEX,
     tipsLibraryVisible: state.scratchGui.modals.tipsLibrary
 });