diff --git a/Gemfile b/Gemfile
index 542880f531..2db865c8db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,10 +113,7 @@ gem 'foundation-rails', '= 5.5.2.1'
 gem 'jquery-migrate-rails'
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
-gem 'select2-rails', '~> 3.4.7'
-# Thor v0.20 works with both select2-rails 3.4.7 and railties 6.0.3.6
-#   To upgrade to thor v1 we need to upgrade select2-rails to v3.5 which requires some work
-gem 'thor', '~> 0.20'
+gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5916f3350d..4bbb8c7ed5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,6 +21,15 @@ GIT
   specs:
     ofn-qz (0.1.0)
 
+GIT
+  remote: https://github.com/openfoodfoundation/select2-rails.git
+  revision: fc240e85fbdf1878ff3c39d972c0cd9a312f5ed4
+  branch: v349_with_thor_v1
+  specs:
+    select2-rails (3.4.9)
+      sass-rails
+      thor (>= 0.14)
+
 PATH
   remote: engines/catalog
   specs:
@@ -565,9 +574,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    select2-rails (3.4.9)
-      sass-rails
-      thor (~> 0.14)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -613,7 +619,7 @@ GEM
     test-prof (1.0.5)
     test-unit (3.4.2)
       power_assert
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
     thwait (0.2.0)
       e2mmap
@@ -767,7 +773,7 @@ DEPENDENCIES
   rubocop-rails
   sass (~> 3.4.0)
   sass-rails (< 5.1.0)
-  select2-rails (~> 3.4.7)
+  select2-rails!
   selenium-webdriver
   shoulda-matchers
   sidekiq
@@ -780,7 +786,6 @@ DEPENDENCIES
   stripe
   test-prof
   test-unit (~> 3.4)
-  thor (~> 0.20)
   timecop
   uglifier (>= 1.0.3)
   unicorn-rails