diff --git a/init.lua b/init.lua
index 041def4..184ad37 100644
--- a/init.lua
+++ b/init.lua
@@ -125,3 +125,5 @@ require'nvim-treesitter.configs'.setup {
 }
 -------------------- LUASNIP -------------------------------
 require("luasnip.loaders.from_vscode").load()
+-------------------- BUFFERLINE ----------------------------
+require("bufferline").setup{}
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index bd1a8c0..583fdb6 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -15,8 +15,8 @@ utils.map('n', '<leader>yy', '"+yy')
 -- Tabs
 utils.map('n', '<F2>', ':tabnew .<CR>')
 utils.map('i', '<F2>', '<Esc>:tabnew .<CR>')
-utils.map('n', '<S-Right>', 'gt')
-utils.map('n', '<S-Left>', 'gT')
+utils.map('n', '<S-Right>', ':BufferLineCycleNext<CR>')
+utils.map('n', '<S-Left>', ':BufferLineCyclePrev<CR>')
 -- Split movement
 utils.map('n', '<A-Up>', ':wincmd k<CR>')
 utils.map('n', '<A-Down>', ':wincmd j<CR>')
diff --git a/lua/plugins.lua b/lua/plugins.lua
index e1f5277..01b00fb 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -40,4 +40,8 @@ return require('packer').startup(function()
   use {'ahmedkhalf/project.nvim'}
   use {'p00f/nvim-ts-rainbow'}
   use {'simrat39/symbols-outline.nvim'}
+  use {
+    'akinsho/bufferline.nvim',
+    requires = 'kyazdani42/nvim-web-devicons'
+  }
 end)