diff --git a/config.js b/config.js
index 275ad6bdb3..187de0c419 100644
--- a/config.js
+++ b/config.js
@@ -392,7 +392,9 @@ var config = {
     // enableClosePage: false,
 
     // Disable hiding of remote thumbnails when in a 1-on-1 conference call.
-    // disable1On1Mode: false,
+    // Setting this to null, will also disable showing the remote videos
+    // when the toolbar is shown on mouse movements
+    // disable1On1Mode: null | false | true,
 
     // Default language for the user interface.
     // defaultLanguage: 'en',
diff --git a/react/features/filmstrip/functions.web.js b/react/features/filmstrip/functions.web.js
index 420ed5aa7a..9d4932ff4a 100644
--- a/react/features/filmstrip/functions.web.js
+++ b/react/features/filmstrip/functions.web.js
@@ -66,6 +66,7 @@ export function shouldRemoteVideosBeVisible(state: Object) {
     // in the filmstrip.
     const participantCount = getParticipantCountWithFake(state);
     let pinnedParticipant;
+    const { disable1On1Mode } = state['features/base/config'];
 
     return Boolean(
         participantCount > 2
@@ -73,11 +74,12 @@ export function shouldRemoteVideosBeVisible(state: Object) {
             // Always show the filmstrip when there is another participant to
             // show and the  local video is pinned, or the toolbar is displayed.
             || (participantCount > 1
+                && disable1On1Mode !== null
                 && (state['features/toolbox'].visible
                     || ((pinnedParticipant = getPinnedParticipant(state))
                         && pinnedParticipant.local)))
 
-            || state['features/base/config'].disable1On1Mode);
+            || disable1On1Mode);
 }
 
 /**