1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/commands/generate/generate_command.rb b/railties/lib/rails/commands/generate/generate_command.rb
index 59b2febc43..2718b453a8 100644
--- a/railties/lib/rails/commands/generate/generate_command.rb
+++ b/railties/lib/rails/commands/generate/generate_command.rb
@@ -4,6 +4,9 @@ module Rails
   module Command
     class GenerateCommand < Base # :nodoc:
       def help
+        require_application_and_environment!
+        load_generators
+
         Rails::Generators.help self.class.command_name
       end
 
@@ -14,6 +17,8 @@ module Rails
         require_application_and_environment!
         load_generators
 
+        ARGV.shift
+
         Rails::Generators.invoke generator, args, behavior: :invoke, destination_root: Rails::Command.root
       end
     end