diff --git a/components/Buttons/JFButtons.bs b/components/Buttons/JFButtons.bs
index f8f6e394f..a04aa24f2 100644
--- a/components/Buttons/JFButtons.bs
+++ b/components/Buttons/JFButtons.bs
@@ -102,6 +102,7 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "left"
diff --git a/components/Buttons/SlideOutButton.bs b/components/Buttons/SlideOutButton.bs
index 33ae9d3d6..9b8494035 100644
--- a/components/Buttons/SlideOutButton.bs
+++ b/components/Buttons/SlideOutButton.bs
@@ -88,6 +88,8 @@ sub onPaddingChanged()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK" and m.top.hasFocus()
diff --git a/components/ItemGrid/Alpha.bs b/components/ItemGrid/Alpha.bs
index 26b686808..c4e005ad8 100644
--- a/components/ItemGrid/Alpha.bs
+++ b/components/ItemGrid/Alpha.bs
@@ -10,6 +10,7 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK"
diff --git a/components/ItemGrid/ItemGrid.bs b/components/ItemGrid/ItemGrid.bs
index c140f2313..c04ca807a 100644
--- a/components/ItemGrid/ItemGrid.bs
+++ b/components/ItemGrid/ItemGrid.bs
@@ -757,6 +757,9 @@ function getItemFocused()
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     if m.itemGrid.opacity = 1
diff --git a/components/ItemGrid/ItemGridOptions.bs b/components/ItemGrid/ItemGridOptions.bs
index 7d43137da..a307206e5 100644
--- a/components/ItemGrid/ItemGridOptions.bs
+++ b/components/ItemGrid/ItemGridOptions.bs
@@ -247,6 +247,9 @@ sub saveFavoriteItemSelected(msg)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "down" or (key = "OK" and m.buttons.hasFocus())
         m.buttons.setFocus(false)
         m.menus[m.selectedItem].setFocus(true)
diff --git a/components/ItemGrid/MovieLibraryView.bs b/components/ItemGrid/MovieLibraryView.bs
index 9fe494015..154d8fb11 100644
--- a/components/ItemGrid/MovieLibraryView.bs
+++ b/components/ItemGrid/MovieLibraryView.bs
@@ -834,6 +834,9 @@ sub onChannelSelected(msg)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     if key = "left" and m.voiceBox.isinFocusChain()
diff --git a/components/ItemGrid/MusicLibraryView.bs b/components/ItemGrid/MusicLibraryView.bs
index 0ca07b5bf..d64ee4a3b 100644
--- a/components/ItemGrid/MusicLibraryView.bs
+++ b/components/ItemGrid/MusicLibraryView.bs
@@ -699,6 +699,8 @@ sub onChannelSelected(msg)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "left" and m.voiceBox.isinFocusChain()
diff --git a/components/JFScene.bs b/components/JFScene.bs
index 1a0e90016..64e775485 100644
--- a/components/JFScene.bs
+++ b/components/JFScene.bs
@@ -11,22 +11,9 @@ sub isLoadingChanged()
     m.spinner.visible = m.top.isLoading
 end sub
 
-' Triggered when the disableRemote boolean component field is changed
-sub disableRemoteChanged()
-    if m.top.disableRemote
-        dialog = createObject("roSGNode", "ProgressDialog")
-        dialog.id = "invisibiledialog"
-        dialog.visible = false
-        dialog.opacity = 0
-        m.top.dialog = dialog
-    else
-        if isValid(m.top.dialog)
-            m.top.dialog.close = true
-        end if
-    end if
-end sub
-
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.disableRemote then return false
     if not press then return false
 
     if key = "back"
diff --git a/components/JFScene.xml b/components/JFScene.xml
index 2afa46eaf..37b62a172 100644
--- a/components/JFScene.xml
+++ b/components/JFScene.xml
@@ -6,7 +6,7 @@
     <Spinner id="spinner" translation="[897, 477]" visible="false" />
   </children>
   <interface>
-    <field id="disableRemote" type="boolean" value="false" onchange="disableRemoteChanged" />
+    <field id="disableRemote" type="boolean" value="false" />
     <field id="isLoading" type="boolean" value="false" onchange="isLoadingChanged" />
     <field id="exit" type="boolean" alwaysNotify="true" />
   </interface>
diff --git a/components/RadioDialog.bs b/components/RadioDialog.bs
index 9d79a0ee8..2e47f4285 100644
--- a/components/RadioDialog.bs
+++ b/components/RadioDialog.bs
@@ -117,6 +117,8 @@ sub onContentDataChanged()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if key = "right"
         ' By default RIGHT from the option list selects the OK button
         ' Instead, keep the user on the option list
diff --git a/components/config/LoginScene.bs b/components/config/LoginScene.bs
index 80b6c75a2..2b4dbb563 100644
--- a/components/config/LoginScene.bs
+++ b/components/config/LoginScene.bs
@@ -5,6 +5,9 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
     ' Returns true if user navigates to a new focusable element
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     list = m.top.findNode("configOptions")
diff --git a/components/config/SetServerScreen.bs b/components/config/SetServerScreen.bs
index 78d29e667..b93284e33 100644
--- a/components/config/SetServerScreen.bs
+++ b/components/config/SetServerScreen.bs
@@ -17,6 +17,9 @@ sub init()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     m.log.debug("SetServerScreen onKeyEvent", key, press)
 
     if not press then return true
diff --git a/components/home/HomeRows.bs b/components/home/HomeRows.bs
index 100a41b06..08409628d 100644
--- a/components/home/HomeRows.bs
+++ b/components/home/HomeRows.bs
@@ -557,6 +557,9 @@ sub itemSelected()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if press
         if key = "play"
             print "play was pressed from homerow"
diff --git a/components/keyboards/IntegerKeyboard.bs b/components/keyboards/IntegerKeyboard.bs
index 2f50a8999..d5f54cb5e 100644
--- a/components/keyboards/IntegerKeyboard.bs
+++ b/components/keyboards/IntegerKeyboard.bs
@@ -3,6 +3,9 @@ sub init()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "back"
         m.top.escape = key
         return true
diff --git a/components/liveTv/ProgramDetails.bs b/components/liveTv/ProgramDetails.bs
index c1ec9e02f..de23d6c09 100644
--- a/components/liveTv/ProgramDetails.bs
+++ b/components/liveTv/ProgramDetails.bs
@@ -316,6 +316,8 @@ sub onAnimationComplete()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK" and m.viewChannelButton.hasFocus()
diff --git a/components/liveTv/schedule.bs b/components/liveTv/schedule.bs
index 0fe5b7542..6b0c8b731 100644
--- a/components/liveTv/schedule.bs
+++ b/components/liveTv/schedule.bs
@@ -285,6 +285,8 @@ sub onRecordOperationDone()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     detailsGrp = m.top.findNode("detailsPane")
diff --git a/components/login/UserRow.bs b/components/login/UserRow.bs
index 733448067..a32a7c808 100644
--- a/components/login/UserRow.bs
+++ b/components/login/UserRow.bs
@@ -47,6 +47,8 @@ sub setUser()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     return false
diff --git a/components/login/UserSelect.bs b/components/login/UserSelect.bs
index 02ab03d38..500307166 100644
--- a/components/login/UserSelect.bs
+++ b/components/login/UserSelect.bs
@@ -25,6 +25,8 @@ sub redraw()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "back"
diff --git a/components/movies/MovieDetails.bs b/components/movies/MovieDetails.bs
index 9cc79d802..29219d33d 100644
--- a/components/movies/MovieDetails.bs
+++ b/components/movies/MovieDetails.bs
@@ -347,6 +347,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     ' Due to the way the button pressed event works, need to catch the release for the button as the press is being sent
     ' directly to the main loop.  Will get this sorted in the layout update for Movie Details
     if key = "OK" and m.top.findNode("options-button").isInFocusChain()
diff --git a/components/movies/MovieOptions.bs b/components/movies/MovieOptions.bs
index fa8cc481f..464aa0f4c 100644
--- a/components/movies/MovieOptions.bs
+++ b/components/movies/MovieOptions.bs
@@ -96,6 +96,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     if key = "down" or (key = "OK" and m.top.findNode("buttons").hasFocus())
         m.top.findNode("buttons").setFocus(false)
         m.menus[m.selectedItem].setFocus(true)
diff --git a/components/music/AlbumGrid.bs b/components/music/AlbumGrid.bs
index a7d1ef9a6..140c60e2a 100644
--- a/components/music/AlbumGrid.bs
+++ b/components/music/AlbumGrid.bs
@@ -37,6 +37,8 @@ function getData()
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "up"
diff --git a/components/music/AlbumView.bs b/components/music/AlbumView.bs
index 763c5f4ad..400b5123f 100644
--- a/components/music/AlbumView.bs
+++ b/components/music/AlbumView.bs
@@ -95,6 +95,9 @@ sub setOnScreenTextValues(json)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     if key = "options"
diff --git a/components/music/ArtistView.bs b/components/music/ArtistView.bs
index e745612ba..c2a82e7d6 100644
--- a/components/music/ArtistView.bs
+++ b/components/music/ArtistView.bs
@@ -252,6 +252,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     if m.buttonGrp.isInFocusChain()
         if key = "OK"
             if press
diff --git a/components/music/AudioPlayerView.bs b/components/music/AudioPlayerView.bs
index d9c3e1f93..a84507e8e 100644
--- a/components/music/AudioPlayerView.bs
+++ b/components/music/AudioPlayerView.bs
@@ -543,6 +543,8 @@ end sub
 ' Process key press events
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     ' Key bindings for remote control buttons
     if press
         ' If user presses key to turn off screensaver, don't do anything else with it
diff --git a/components/music/PlaylistView.bs b/components/music/PlaylistView.bs
index f35a7342f..b935e01d5 100644
--- a/components/music/PlaylistView.bs
+++ b/components/music/PlaylistView.bs
@@ -94,6 +94,8 @@ sub setOnScreenTextValues(json)
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "options"
diff --git a/components/options/OptionsSlider.bs b/components/options/OptionsSlider.bs
index 25248938b..f192ba85f 100644
--- a/components/options/OptionsSlider.bs
+++ b/components/options/OptionsSlider.bs
@@ -24,6 +24,8 @@ sub setFields()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "options" or key = "back"
diff --git a/components/photos/PhotoDetails.bs b/components/photos/PhotoDetails.bs
index 07d16f67a..3937d772d 100644
--- a/components/photos/PhotoDetails.bs
+++ b/components/photos/PhotoDetails.bs
@@ -110,6 +110,8 @@ sub isRandomChanged()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "right"
diff --git a/components/quickConnect/QuickConnectDialog.bs b/components/quickConnect/QuickConnectDialog.bs
index 5676c3ef2..b8843f38f 100644
--- a/components/quickConnect/QuickConnectDialog.bs
+++ b/components/quickConnect/QuickConnectDialog.bs
@@ -59,6 +59,9 @@ sub onButtonSelected()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if not press then return false
 
     ' Note that "OK" does not get sent here, hence onButtonSelected() above.
diff --git a/components/search/SearchResults.bs b/components/search/SearchResults.bs
index 1cfc3cd4a..747837074 100644
--- a/components/search/SearchResults.bs
+++ b/components/search/SearchResults.bs
@@ -53,6 +53,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     m.searchAlphabox = m.top.findNode("search_Key")
     if m.searchAlphabox.textEditBox.hasFocus()
         m.searchAlphabox.textEditBox.translation = "[0, -150]"
diff --git a/components/settings/settings.bs b/components/settings/settings.bs
index dec4b043c..37f1b7831 100644
--- a/components/settings/settings.bs
+++ b/components/settings/settings.bs
@@ -231,6 +231,8 @@ function isFormInFocus() as boolean
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if (key = "back" or key = "left") and m.settingsMenu.focusedChild <> invalid and m.userLocation.Count() > 1
diff --git a/components/tvshows/TVEpisodeRow.bs b/components/tvshows/TVEpisodeRow.bs
index 5782723f9..589cd94ed 100644
--- a/components/tvshows/TVEpisodeRow.bs
+++ b/components/tvshows/TVEpisodeRow.bs
@@ -56,6 +56,8 @@ function setData()
 end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     return false
diff --git a/components/tvshows/TVEpisodeRowWithOptions.bs b/components/tvshows/TVEpisodeRowWithOptions.bs
index d982d82c7..876792dc8 100644
--- a/components/tvshows/TVEpisodeRowWithOptions.bs
+++ b/components/tvshows/TVEpisodeRowWithOptions.bs
@@ -81,6 +81,8 @@ sub videoOptionsClosed()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "options" and isValid(m.rows.focusedChild) and isValid(m.rows.focusedChild.rowItemFocused)
diff --git a/components/tvshows/TVEpisodes.bs b/components/tvshows/TVEpisodes.bs
index ffc225cdc..1b0176608 100644
--- a/components/tvshows/TVEpisodes.bs
+++ b/components/tvshows/TVEpisodes.bs
@@ -68,6 +68,9 @@ end function
 
 ' Handle navigation input from the remote and act on it
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "left" and m.tvEpisodeRow.hasFocus()
         m.shuffle.setFocus(true)
         return true
diff --git a/components/tvshows/TVListOptions.bs b/components/tvshows/TVListOptions.bs
index 5cf169db6..cc753e5f7 100644
--- a/components/tvshows/TVListOptions.bs
+++ b/components/tvshows/TVListOptions.bs
@@ -98,6 +98,8 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     if key = "down" or (key = "OK" and m.top.findNode("buttons").hasFocus())
         m.top.findNode("buttons").setFocus(false)
         m.menus[m.selectedItem].setFocus(true)
diff --git a/components/tvshows/TVShowDetails.bs b/components/tvshows/TVShowDetails.bs
index e55ec225e..2781f6b17 100644
--- a/components/tvshows/TVShowDetails.bs
+++ b/components/tvshows/TVShowDetails.bs
@@ -183,6 +183,9 @@ sub onShuffleEpisodeDataLoaded()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
+
     if key = "OK" or key = "play"
         if m.Shuffle.hasFocus()
             m.getShuffleEpisodesTask.showID = m.top.itemContent.id
diff --git a/components/video/OSD.bs b/components/video/OSD.bs
index fe640a1e7..3639dcbeb 100644
--- a/components/video/OSD.bs
+++ b/components/video/OSD.bs
@@ -139,6 +139,8 @@ sub onButtonSelected()
 end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
+
+    if m.top.getScene().disableRemote then return false
     if not press then return false
 
     if key = "OK"
diff --git a/components/video/VideoPlayerView.bs b/components/video/VideoPlayerView.bs
index 1aa96ba96..3eaef4a43 100644
--- a/components/video/VideoPlayerView.bs
+++ b/components/video/VideoPlayerView.bs
@@ -581,6 +581,8 @@ end function
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
+    if m.top.getScene().disableRemote then return false
+
     ' Keypress handler while user is inside the chapter menu
     if m.chapterMenu.hasFocus()
         if not press then return false