diff --git a/README.md b/README.md
index 61a82a1..2b17cde 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ The following are configuration options and their defaults.
 let g:lazygit_floating_window_winblend = 0 " transparency of floating window
 let g:lazygit_floating_window_scaling_factor = 0.9 " scaling factor for floating window
 let g:lazygit_floating_window_corner_chars = ['╭', '╮', '╰', '╯'] " customize lazygit popup window corner characters
+let g:lazygit_floating_window_use_plenary = 0 " use plenary.nvim to manage floating window if available
 let g:lazygit_use_neovim_remote = 1 " fallback to 0 if neovim-remote is not installed
 ```
 
diff --git a/lua/lazygit.lua b/lua/lazygit.lua
index 8d4d412..681be58 100644
--- a/lua/lazygit.lua
+++ b/lua/lazygit.lua
@@ -67,6 +67,12 @@ local function open_floating_window()
         floating_window_scaling_factor = floating_window_scaling_factor[false]
     end
 
+    local status, plenary = pcall(require, 'plenary.window.float')
+    if status and vim.g.lazygit_floating_window_use_plenary and vim.g.lazygit_floating_window_use_plenary ~= 0 then
+        plenary.percentage_range_window(floating_window_scaling_factor, floating_window_scaling_factor)
+        return
+    end
+
     local height = math.ceil(vim.o.lines * floating_window_scaling_factor) - 1
     local width = math.ceil(vim.o.columns * floating_window_scaling_factor)