diff --git a/Gemfile b/Gemfile
index 259e59200e7..fba0e12183e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,6 +188,7 @@ group :development do
   gem 'rubocop-rails'
   gem 'spring'
   gem 'spring-commands-rspec'
+  gem 'spring-commands-rubocop'
   gem 'web-console'
 
   gem 'rack-mini-profiler', '< 3.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index cb163b720f8..1ad8fc40622 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -704,6 +704,8 @@ GEM
     spring (4.1.3)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    spring-commands-rubocop (0.4.0)
+      spring (>= 1.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -925,6 +927,7 @@ DEPENDENCIES
   spreadsheet_architect
   spring
   spring-commands-rspec
+  spring-commands-rubocop
   state_machines-activerecord
   stimulus_reflex (= 3.5.0.rc3)
   stimulus_reflex_testing
diff --git a/bin/rubocop b/bin/rubocop
new file mode 100755
index 00000000000..671f09c3ee7
--- /dev/null
+++ b/bin/rubocop
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+load File.expand_path("spring", __dir__)
+require 'bundler/setup'
+load Gem.bin_path('rubocop', 'rubocop')
diff --git a/bin/spring b/bin/spring
index 37f429ba024..a81373ab6e6 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# This file loads Spring without using loading other gems in the Gemfile, in order to be fast.
+# This file loads Spring without loading other gems in the Gemfile in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
 
 if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])