diff --git a/lib/homesick/cli.rb b/lib/homesick/cli.rb
index d896712..91c3265 100644
--- a/lib/homesick/cli.rb
+++ b/lib/homesick/cli.rb
@@ -283,11 +283,11 @@ module Homesick
       end
       check_castle_existance castle, 'open'
       castle_dir = repos_dir.join(castle)
-      say_status "#{ENV['EDITOR']} #{castle_dir.realpath}",
+      say_status "#{castle_dir.realpath}: #{ENV['EDITOR']} .",
                  "Opening the root directory of castle '#{castle}' in editor '#{ENV['EDITOR']}'.",
                  :green
       inside castle_dir do
-        system(ENV['EDITOR'])
+        system("#{ENV['EDITOR']} .")
       end
     end
 
diff --git a/spec/homesick_cli_spec.rb b/spec/homesick_cli_spec.rb
index 85688a7..a9ba3b8 100644
--- a/spec/homesick_cli_spec.rb
+++ b/spec/homesick_cli_spec.rb
@@ -712,7 +712,7 @@ describe Homesick::CLI do
       allow(ENV).to receive(:[]).with('EDITOR').and_return('vim')
       given_castle 'castle_repo'
       expect(homesick).to receive('inside').once.with(kind_of(Pathname)).and_yield
-      expect(homesick).to receive('system').once.with('vim')
+      expect(homesick).to receive('system').once.with('vim .')
       Capture.stdout { homesick.open 'castle_repo' }
     end