diff --git a/lib/irb/easter-egg.rb b/lib/irb/easter-egg.rb
index 439e5755b..14dc93fc9 100644
--- a/lib/irb/easter-egg.rb
+++ b/lib/irb/easter-egg.rb
@@ -107,13 +107,14 @@ def render_frame(i)
     end
 
     private def easter_egg(type = nil)
+      print "\e[?1049h"
       type ||= [:logo, :dancing].sample
       case type
       when :logo
-        require "rdoc"
-        RDoc::RI::Driver.new.page do |io|
-          type = STDOUT.external_encoding == Encoding::UTF_8 ? :unicode_large : :ascii_large
-          io.write easter_egg_logo(type)
+        Pager.page do |io|
+          logo_type = STDOUT.external_encoding == Encoding::UTF_8 ? :unicode_large : :ascii_large
+          io.write easter_egg_logo(logo_type)
+          STDIN.raw { STDIN.getc } if io == STDOUT
         end
       when :dancing
         STDOUT.cooked do
@@ -138,10 +139,11 @@ def render_frame(i)
           end
         rescue Interrupt
         ensure
-          print "\e[0m\e[?1049l"
           trap("SIGINT", prev_trap)
         end
       end
+    ensure
+      print "\e[0m\e[?1049l"
     end
   end
 end
diff --git a/test/irb/test_input_method.rb b/test/irb/test_input_method.rb
index 915297f56..bd107551d 100644
--- a/test/irb/test_input_method.rb
+++ b/test/irb/test_input_method.rb
@@ -70,6 +70,7 @@ def test_initialization_without_use_autocomplete
     end
 
     def test_initialization_with_use_autocomplete
+      omit 'This test requires RDoc' unless defined?(RDoc)
       original_show_doc_proc = Reline.dialog_proc(:show_doc)&.dialog_proc
       empty_proc = Proc.new {}
       Reline.add_dialog_proc(:show_doc, empty_proc)
@@ -190,5 +191,5 @@ def test_perfect_matching_handles_nil_namespace
     def has_rdoc_content?
       File.exist?(RDoc::RI::Paths::BASE)
     end
-  end
-end if defined?(RDoc)
+  end if defined?(RDoc)
+end