diff --git a/README.md b/README.md
index f0f8260d..3376516d 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ require'nvim-tree'.setup {
 - `W` will collapse the whole tree
 - `S` will prompt the user to enter a path and then expands the tree to match the path
 - `.` will enter vim command mode with the file the cursor is on
-- `C-k` will show file infos about the file under the cursor
+- `C-k` will toggle a popup with file infos about the file under the cursor
 
 ### Settings
 
@@ -293,7 +293,7 @@ local list = {
   { key = "g?",                           action = "toggle_help" },
   { key = "W",                            action = "collapse_all" },
   { key = "S",                            action = "search_node" },
-  { key = "<C-k>",                        action = "show_file_info" },
+  { key = "<C-k>",                        action = "toggle_file_info" },
   { key = ".",                            action = "run_file_command" }
 }
 ```
diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt
index d0e17947..5bf3e432 100644
--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -627,7 +627,7 @@ INFORMATIONS				        *nvim-tree-info*
 - `W` will collapse the whole tree
 - `S` will prompt the user to enter a path and then expands the tree to match the path
 - `.` will enter vim command mode with the file the cursor is on
-- `C-k` will show file infos about the file under the cursor
+- `C-k` will toggle a popup with file infos about the file under the cursor
 
 Defaults to:
 >
@@ -670,7 +670,7 @@ Defaults to:
       { key = 'W',                            action = "collapse_all" },
       { key = "S",                            action = "search_node" },
       { key = ".",                            action = "run_file_command" },
-      { key = "<C-k>",                        action = "show_file_info" }
+      { key = "<C-k>",                        action = "toggle_file_info" }
     }
 <
 The `list` option in `view.mappings.list` is a table of
diff --git a/lua/nvim-tree/actions/file-popup.lua b/lua/nvim-tree/actions/file-popup.lua
index 79cdd496..b8f00c3e 100644
--- a/lua/nvim-tree/actions/file-popup.lua
+++ b/lua/nvim-tree/actions/file-popup.lua
@@ -20,11 +20,13 @@ local function get_formatted_lines(node)
   }
 end
 
-local winnr = nil
+local current_popup = nil
+
+local function setup_window(node)
+  local lines = get_formatted_lines(node)
 
-local function setup_window(lines)
   local max_width = vim.fn.max(vim.tbl_map(function(n) return #n end, lines))
-  winnr = a.nvim_open_win(0, false, {
+  local winnr = a.nvim_open_win(0, false, {
     col = 1,
     row = 1,
     relative = "cursor",
@@ -34,25 +36,36 @@ local function setup_window(lines)
     noautocmd = true,
     style = 'minimal'
   })
+  current_popup = {
+    winnr = winnr,
+    file_path = node.absolute_path
+  }
   local bufnr = a.nvim_create_buf(false, true)
   a.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
   a.nvim_win_set_buf(winnr, bufnr)
 end
 
 function M.close_popup()
-  if winnr ~= nil then
-    a.nvim_win_close(winnr, { force = true })
+  if current_popup ~= nil then
+    a.nvim_win_close(current_popup.winnr, { force = true })
     vim.cmd "augroup NvimTreeRemoveFilePopup | au! CursorMoved | augroup END"
 
-    winnr = nil
+    current_popup = nil
   end
 end
 
-function M.show_file_info(node)
-  M.close_popup()
+function M.toggle_file_info(node)
+  if current_popup ~= nil then
+    local is_same_node = current_popup.file_path == node.absolute_path
 
-  local lines = get_formatted_lines(node)
-  setup_window(lines)
+    M.close_popup()
+
+    if is_same_node then
+      return
+    end
+  end
+
+  setup_window(node)
 
   vim.cmd [[
     augroup NvimTreeRemoveFilePopup
diff --git a/lua/nvim-tree/actions/init.lua b/lua/nvim-tree/actions/init.lua
index 9726178f..e39273bb 100644
--- a/lua/nvim-tree/actions/init.lua
+++ b/lua/nvim-tree/actions/init.lua
@@ -44,7 +44,7 @@ local M = {
     { key = 'W',                            action = "collapse_all" },
     { key = "S",                            action = "search_node" },
     { key = ".",                            action = "run_file_command" },
-    { key = "<C-k>",                        action = "show_file_info" }
+    { key = "<C-k>",                        action = "toggle_file_info" }
   },
   custom_keypress_funcs = {},
 }
@@ -74,7 +74,7 @@ local keypress_funcs = {
   rename = require'nvim-tree.actions.rename-file'.fn(false),
   run_file_command = require'nvim-tree.actions.run-command'.run_file_command,
   search_node = require'nvim-tree.actions.search-node'.fn,
-  show_file_info = require'nvim-tree.actions.file-popup'.show_file_info,
+  toggle_file_info = require'nvim-tree.actions.file-popup'.toggle_file_info,
   system_open = require'nvim-tree.actions.system-open'.fn,
   toggle_dotfiles = require"nvim-tree.actions.toggles".dotfiles,
   toggle_help = require"nvim-tree.actions.toggles".help,