diff --git a/lua/commands.lua b/lua/commands.lua
index ac5a83f..26101e6 100644
--- a/lua/commands.lua
+++ b/lua/commands.lua
@@ -1,3 +1,16 @@
+-- :TabWidth <N> set the tab width for the current buffer
+vim.api.nvim_create_user_command('TabWidth', function(opts)
+  -- Set the tab width for the current filetype
+  -- FIXME: Doesn't seem to cover all bases in neovim when editorconfig is
+  -- involved, specifically with pressing o/O in C++ from a line with a brace.
+  -- This might be related to tree-sitter indentation? Or could be that I've
+  -- not ported over all my filetype settings yet.
+  local width = tonumber(opts.args)
+  vim.opt.tabstop = width
+  vim.opt.shiftwidth = width
+  vim.opt.softtabstop = width
+end, { nargs = 1 })
+
 -- TODO: :Rename
 -- vim.loop.fs_rename