diff --git a/lua/octo/commands.lua b/lua/octo/commands.lua
index 1e8bdd00..7dddde19 100644
--- a/lua/octo/commands.lua
+++ b/lua/octo/commands.lua
@@ -33,7 +33,7 @@ end
 function M.setup()
   vim.api.nvim_create_user_command("Octo", function(opts)
     require("octo.commands").octo(unpack(opts.fargs))
-  end, { complete = require("octo.completion").octo_command_complete, nargs = "*" })
+  end, { complete = require("octo.completion").octo_command_complete, nargs = "*", range = true })
   local conf = config.values
 
   local card_commands
diff --git a/lua/octo/utils.lua b/lua/octo/utils.lua
index a5542aee..dc13952a 100644
--- a/lua/octo/utils.lua
+++ b/lua/octo/utils.lua
@@ -1570,8 +1570,8 @@ function M.get_lines_from_context(calling_context)
     line_number_start = vim.fn.line "."
     line_number_end = line_number_start
   elseif calling_context == "visual" then
-    line_number_start = vim.fn.line "v"
-    line_number_end = vim.fn.line "."
+    line_number_start = vim.fn.line "'<"
+    line_number_end = vim.fn.line "'>"
   elseif calling_context == "motion" then
     line_number_start = vim.fn.getpos("'[")[2]
     line_number_end = vim.fn.getpos("']")[2]