Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20)
@@ -146,7 +146,9 @@
         function onIsManagerChanged             ( vValue ) { if( vValue ) _mainMenu.isManager  ()                }
         function onIsSettingsChanged            ( vValue ) { if( vValue ) _mainMenu.isSettings ()                }
 
-        function onFaultChanged                 ( vValue ) { page( _faultModeScreen                 , vValue    && ! vSettings.noCANBus  )}
+        function onFaultChanged                 ( vValue ) { page( _GuiView.bypassFault ?           // If the -F (disable-fault-screen) set in CLI,
+                                                                   _mainHome            :           // go to home/standby screen
+                                                                   _faultModeScreen                 , vValue    && ! vSettings.noCANBus  )}
         function onServiceChanged               ( vValue ) { page( _serviceModeScreen               , vValue    )}
         function onInitChanged                  ( vValue ) { page( _postModeScreen                  , vValue    && ! vSettings.noCANBus  )
                                                              if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run