diff --git a/lua/core/options.lua b/lua/core/options.lua
index cca5209..4a10919 100644
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -46,6 +46,9 @@ vim.opt.visualbell = true
 vim.opt.errorbells = false
 -- Persistent undo even after you close a file and re-open it
 vim.opt.undofile = true
+-- Bound shada size: cap oldfiles/marks at 20 files and history at 100 entries
+-- each (otherwise ':', '/' and '@' fall back to 'history' = 10000).
+vim.opt.shada = "!,'20,<50,s10,h,r/tmp/,:100,/100,@100"
 -- Align indent to next multiple value of shiftwidth.
 -- E.g., only insert as many spaces necessary for reaching the next shiftwidth
 vim.opt.shiftround = true