diff --git a/lua/octo/pickers/fzf-lua/pickers/assigned_labels.lua b/lua/octo/pickers/fzf-lua/pickers/assigned_labels.lua
index fe12dba1..8cc2ec4a 100644
--- a/lua/octo/pickers/fzf-lua/pickers/assigned_labels.lua
+++ b/lua/octo/pickers/fzf-lua/pickers/assigned_labels.lua
@@ -4,7 +4,10 @@ local graphql = require "octo.gh.graphql"
 local picker_utils = require "octo.pickers.fzf-lua.pickers.utils"
 local utils = require "octo.utils"
 
-return function(cb)
+return function(opts)
+  opts = opts or {}
+  local cb = opts.cb
+
   local bufnr = vim.api.nvim_get_current_buf()
   local buffer = octo_buffers[bufnr]
 
diff --git a/lua/octo/pickers/fzf-lua/pickers/labels.lua b/lua/octo/pickers/fzf-lua/pickers/labels.lua
index 6fc5687b..e033bb14 100644
--- a/lua/octo/pickers/fzf-lua/pickers/labels.lua
+++ b/lua/octo/pickers/fzf-lua/pickers/labels.lua
@@ -4,15 +4,15 @@ local graphql = require "octo.gh.graphql"
 local picker_utils = require "octo.pickers.fzf-lua.pickers.utils"
 local utils = require "octo.utils"
 
-return function(cb)
-  local bufnr = vim.api.nvim_get_current_buf()
-  local buffer = octo_buffers[bufnr]
+return function(opts)
+  opts = opts or {}
 
-  if not buffer then
-    return
-  end
+  local cb = opts.cb
+
+  opts.repo = opts.repo or utils.get_remote_name()
+  local owner, name = utils.split_repo(opts.repo)
 
-  local query = graphql("labels_query", buffer.owner, buffer.name)
+  local query = graphql("labels_query", owner, name)
 
   local get_contents = function(fzf_cb)
     gh.run {