diff --git a/Library/Homebrew/cask/lib/hbc/cli/edit.rb b/Library/Homebrew/cask/lib/hbc/cli/edit.rb
index 8bce81c523..693edcd515 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/edit.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/edit.rb
@@ -8,9 +8,6 @@ module Hbc
       end
 
       def run
-        cask = casks.first
-        cask_path = cask.sourcefile_path
-        odebug "Opening editor for Cask #{cask.token}"
         exec_editor cask_path
       rescue CaskUnavailableError => e
         reason = e.reason.empty? ? "" : "#{e.reason} "
@@ -18,6 +15,14 @@ module Hbc
         raise e.class.new(e.token, reason)
       end
 
+      def cask_path
+        casks.first.sourcefile_path
+      rescue CaskInvalidError
+        path = CaskLoader.path(args.first)
+        return path if path.file?
+        raise
+      end
+
       def self.help
         "edits the given Cask"
       end