diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp
index d96e96b7c7..f2323ba049 100644
--- a/src/system/boot/loader/menu.cpp
+++ b/src/system/boot/loader/menu.cpp
@@ -819,16 +819,23 @@ add_debug_menu()
 		= new(nothrow) MenuItem("Enable serial debug output"));
 	item->SetData("serial_debug_output");
 	item->SetType(MENU_ITEM_MARKABLE);
-    item->SetHelpText("Turns on forwarding the syslog output to the serial "
+	item->SetHelpText("Turns on forwarding the syslog output to the serial "
 		"interface.");
 
 	menu->AddItem(item
 		= new(nothrow) MenuItem("Enable on screen debug output"));
 	item->SetData("debug_screen");
 	item->SetType(MENU_ITEM_MARKABLE);
-    item->SetHelpText("Displays debug output on screen while the system "
+	item->SetHelpText("Displays debug output on screen while the system "
 		"is booting, instead of the normal boot logo.");
 
+	menu->AddItem(item
+		= new(nothrow) MenuItem("Disable on screen paging"));
+	item->SetData("disable_onscreen_paging");
+	item->SetType(MENU_ITEM_MARKABLE);
+	item->SetHelpText("Disables paging when on screen debug output is "
+		"enabled.");
+
 	menu->AddItem(item = new(nothrow) MenuItem("Enable debug syslog"));
 	item->SetType(MENU_ITEM_MARKABLE);
 	item->SetMarked(gKernelArgs.keep_debug_output_buffer);
diff --git a/src/system/kernel/debug/blue_screen.cpp b/src/system/kernel/debug/blue_screen.cpp
index 4c46e966a5..cbd03ea2fd 100644
--- a/src/system/kernel/debug/blue_screen.cpp
+++ b/src/system/kernel/debug/blue_screen.cpp
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <debug.h>
 #include <arch/debug_console.h>
+#include <safemode.h>
 
 #include <string.h>
 #include <stdio.h>
@@ -603,7 +604,8 @@ blue_screen_init(void)
 		return B_ERROR;
 
 	sModule = &gFrameBufferConsoleModule;
-	sScreen.paging = true;
+	sScreen.paging = !get_safemode_boolean(
+		"disable_onscreen_paging", false);
 	sScreen.paging_timeout = false;
 
 	add_debugger_command("paging", set_paging, "Enable or disable paging");