diff --git a/lang/main.json b/lang/main.json
index d891fb6252..b20ec00393 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -31,6 +31,7 @@
         "focusRemote": "Focus on one of the remote videos.",
         "toggleChat": "Open or close the chat panel.",
         "mute": "Mute or unmute the microphone.",
+        "fullScreen": "Enter or exit full screen mode.",
         "videoMute": "Stop or start the local video."
     },
     "welcomepage":{
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index c48e8c2616..f6d239e7e4 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -283,13 +283,13 @@ const defaultToolbarButtons = {
         id: 'toolbar_button_fullScreen',
         tooltipKey: 'toolbar.fullscreen',
         className: "button icon-full-screen",
-        shortcut: 'F',
+        shortcut: 'S',
         shortcutAttr: 'toggleFullscreenPopover',
         shortcutFunc: function() {
             JitsiMeetJS.analytics.sendEvent('shortcut.fullscreen.toggled');
             APP.UI.toggleFullScreen();
         },
-        shortcutDescription: "keyboardShortcuts.toggleChat",
+        shortcutDescription: "keyboardShortcuts.fullScreen",
         content: "Enter / Exit Full Screen",
         i18n: "[content]toolbar.fullscreen"
     },