diff --git a/.rubocop/todo.yml b/.rubocop/todo.yml
index 419601015..ee5130ea6 100644
--- a/.rubocop/todo.yml
+++ b/.rubocop/todo.yml
@@ -883,7 +883,6 @@ Metrics/PerceivedComplexity:
     - 'lib/twitter_sync.rb'
     - 'lib/user_agent.rb'
     - 'test/browser/admin_object_manager_test.rb'
-    - 'test/browser/keyboard_shortcuts_test.rb'
     - 'test/browser_test_helper.rb'
     - 'test/integration/slack_test.rb'
 
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index b33d0f1d1..716cdc559 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -54,6 +54,9 @@ class SessionsController < ApplicationController
 
   # "Delete" a login, aka "log the user out"
   def destroy
+    if Rails.env.test? && ENV['FAKE_SELENIUM_LOGIN_USER_ID'].present?
+      ENV['FAKE_SELENIUM_LOGIN_USER_ID'] = nil # rubocop:disable Rails/EnvironmentVariableAccess
+    end
 
     reset_session
 
diff --git a/script/build/test_slice_tests.sh b/script/build/test_slice_tests.sh
index b72e3cca8..ff40f829b 100755
--- a/script/build/test_slice_tests.sh
+++ b/script/build/test_slice_tests.sh
@@ -45,7 +45,6 @@ if [ "$LEVEL" == '1' ]; then
   rm test/browser/agent_user_profile_test.rb
   rm test/browser/customer_ticket_create_test.rb
   rm test/browser/first_steps_test.rb
-  rm test/browser/keyboard_shortcuts_test.rb
   # test/browser/manage_test.rb
   # test/browser/swich_to_user_test.rb
   # test/browser/taskbar_session_test.rb
@@ -93,7 +92,6 @@ elif [ "$LEVEL" == '2' ]; then
   rm test/browser/agent_user_profile_test.rb
   rm test/browser/customer_ticket_create_test.rb
   rm test/browser/first_steps_test.rb
-  rm test/browser/keyboard_shortcuts_test.rb
   rm test/browser/manage_test.rb
   rm test/browser/taskbar_session_test.rb
   rm test/browser/taskbar_task_test.rb
@@ -140,7 +138,6 @@ elif [ "$LEVEL" == '3' ]; then
   rm test/browser/agent_user_profile_test.rb
   rm test/browser/customer_ticket_create_test.rb
   rm test/browser/first_steps_test.rb
-  rm test/browser/keyboard_shortcuts_test.rb
   rm test/browser/manage_test.rb
   rm test/browser/taskbar_session_test.rb
   rm test/browser/taskbar_task_test.rb
@@ -187,7 +184,6 @@ elif [ "$LEVEL" == '4' ]; then
   rm test/browser/agent_user_profile_test.rb
   # test/browser/customer_ticket_create_test.rb
   rm test/browser/first_steps_test.rb
-  rm test/browser/keyboard_shortcuts_test.rb
   rm test/browser/manage_test.rb
   rm test/browser/taskbar_session_test.rb
   rm test/browser/taskbar_task_test.rb
@@ -233,7 +229,6 @@ elif [ "$LEVEL" == '5' ]; then
   # test/browser/agent_user_profile_test.rb
   rm test/browser/customer_ticket_create_test.rb
   rm test/browser/first_steps_test.rb
-  rm test/browser/keyboard_shortcuts_test.rb
   rm test/browser/manage_test.rb
   rm test/browser/taskbar_session_test.rb
   rm test/browser/taskbar_task_test.rb
@@ -282,7 +277,6 @@ elif [ "$LEVEL" == '6' ]; then
   rm test/browser/agent_user_profile_test.rb
   rm test/browser/customer_ticket_create_test.rb
   # test/browser/first_steps_test.rb
-  # test/browser/keyboard_shortcuts_test.rb
   rm test/browser/manage_test.rb
   rm test/browser/taskbar_session_test.rb
   rm test/browser/taskbar_task_test.rb
diff --git a/spec/support/capybara/custom_extensions.rb b/spec/support/capybara/custom_extensions.rb
index 48f089b1f..dbd72248a 100644
--- a/spec/support/capybara/custom_extensions.rb
+++ b/spec/support/capybara/custom_extensions.rb
@@ -77,6 +77,18 @@ module ZammadCapybarActionDelegator
       await_empty_ajax_queue
     end
   end
+
+  def hot_keys
+    mac_platform? ? %i[control alt] : %i[control shift]
+  end
+
+  def magic_key
+    mac_platform? ? :command : :control
+  end
+
+  def mac_platform?
+    Gem::Platform.local.os.eql? 'darwin'
+  end
 end
 
 module ZammadCapybarSelectorDelegator
diff --git a/spec/support/capybara/selectors.rb b/spec/support/capybara/selectors.rb
index e5f8db949..f9f0fe161 100644
--- a/spec/support/capybara/selectors.rb
+++ b/spec/support/capybara/selectors.rb
@@ -10,6 +10,10 @@ Capybara.add_selector(:active_content) do
   css { |content_class| ['.content.active', content_class].compact.join(' ') }
 end
 
+Capybara.add_selector(:active_modal_content) do
+  css { |content_class| ['.modal .modal-content', content_class].compact.join(' ') }
+end
+
 Capybara.add_selector(:active_ticket_article) do
   css { |article| ['.content.active', "#article-#{article.id}" ].compact.join(' ') }
 end
diff --git a/spec/system/keyboard_shortcuts_spec.rb b/spec/system/keyboard_shortcuts_spec.rb
new file mode 100644
index 000000000..935e3f7c6
--- /dev/null
+++ b/spec/system/keyboard_shortcuts_spec.rb
@@ -0,0 +1,166 @@
+# Copyright (C) 2012-2022 Zammad Foundation, https://zammad-foundation.org/
+
+require 'rails_helper'
+
+RSpec.describe 'Keyboard Shortcuts', type: :system do
+  context 'Navigation shortcut' do
+    context 'for Dashboard' do
+      before do
+        visit 'ticket/view' # visit a different page first
+        send_keys([*hot_keys, 'd'])
+      end
+
+      it 'shows Dashboard page' do
+        expect(page).to have_title('Dashboard')
+      end
+    end
+
+    context 'for Overviews' do
+      before do
+        visit 'dashboard' # visit a different page first
+        send_keys([*hot_keys, 'o'])
+      end
+
+      it 'shows Overviews page' do
+        expect(page).to have_title('My assigned Tickets')
+      end
+    end
+
+    context 'for Search' do
+      before do
+        within :active_content do
+          send_keys([*hot_keys, 's'])
+        end
+      end
+
+      it 'changes focus to search input' do
+        expect(page).to have_selector('#global-search:focus')
+      end
+    end
+
+    context 'for Notifications' do
+      let(:popover_notification_selector) { '.popover--notifications.js-notificationsContainer' }
+
+      before do
+        send_keys([*hot_keys, 'a'])
+      end
+
+      it 'shows notifications popover' do
+        within popover_notification_selector do
+          expect(page).to have_text 'Notifications'
+        end
+      end
+
+      it 'hides notifications popover when re-pressed' do
+        within popover_notification_selector do
+          send_keys([*hot_keys, 'a'])
+        end
+
+        expect(page).to have_no_selector popover_notification_selector
+      end
+    end
+
+    context 'for New Ticket' do
+      before do
+        send_keys([*hot_keys, 'n'])
+      end
+
+      it 'opens a new ticket page' do
+        within :active_content do
+          expect(page).to have_selector('.newTicket h1', text: 'New Ticket')
+        end
+      end
+    end
+
+    context 'for Logout' do
+      before do
+        send_keys([*hot_keys, 'e'])
+      end
+
+      it 'goes to sign in page' do
+        expect(page).to have_title('Sign in')
+      end
+    end
+
+    context 'for list of shortcuts' do
+      before do
+        send_keys([*hot_keys, 'h'])
+        wait(5).until_exists { find :active_modal_content }
+      end
+
+      it 'shows list of shortcuts' do
+        within :active_modal_content do
+          expect(page).to have_selector('h1.modal-title', text: 'Keyboard Shortcuts')
+        end
+      end
+
+      it 'hides list of shortcuts when re-pressed' do
+        within :active_modal_content do
+          send_keys([*hot_keys, 'h'])
+        end
+
+        expect(page).to have_no_selector :active_modal_content
+      end
+    end
+
+    context 'for Close current tab' do
+      before do
+        send_keys([*hot_keys, 'n']) # opens a new ticket
+
+        within :active_content, '.newTicket' do # make sure to close new ticket
+          send_keys([*hot_keys, 'w'])
+        end
+      end
+
+      it 'closes current tab' do
+        within :active_content do
+          expect(page).to have_no_selector('.newTicket')
+        end
+      end
+    end
+
+    context 'with tab as shortcut' do
+      before do
+        # The current hotkey for the next/previous tab is not working on linux/windows, skip for now.
+        skip('current hotkey for the next/previous tab is not working on linux/windows')
+
+        visit 'ticket/create'
+
+        within :active_content, '.newTicket' do
+          find('[data-type="phone-in"]').click
+          visit 'ticket/create'
+        end
+
+        within :active_content, '.newTicket' do
+          find('[data-type="phone-out"]').click
+          visit 'ticket/create'
+        end
+
+        within :active_content, '.newTicket' do
+          find('[data-type="email-out"]').click
+          send_keys([*hot_keys, *tab]) # open next/prev tab
+        end
+      end
+
+      context 'for Next in tab' do
+        let(:tab) { [:tab] }
+
+        it 'show the next tab' do
+          within :active_content, 'form.ticket-create' do
+            expect(page).to have_title 'Call Inbound'
+          end
+        end
+      end
+
+      context 'shows the previous tab' do
+        let(:tab) { %i[shift tab] }
+
+        it 'shows the previous tab' do
+          within :active_content, 'form.ticket-create' do
+            expect(page).to have_title 'Call Outbound'
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/test/browser/keyboard_shortcuts_test.rb b/test/browser/keyboard_shortcuts_test.rb
deleted file mode 100644
index b97fb1a92..000000000
--- a/test/browser/keyboard_shortcuts_test.rb
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright (C) 2012-2022 Zammad Foundation, https://zammad-foundation.org/
-
-require 'browser_test_helper'
-
-class KeyboardShortcutsTest < TestCase
-  def test_navigation
-    @browser = browser_instance
-    login(
-      username: 'admin@example.com',
-      password: 'test',
-      url:      browser_url,
-    )
-    tasks_close_all
-    sleep 2
-
-    # show shortkeys
-    shortcut(key: 'h')
-
-    # ff issue, sometimes shortcut is not fired in browser test env
-    if ENV['BROWSER'] && ENV['BROWSER'] =~ %r{firefox}i
-      exists = false
-      (1..4).each do |_count|
-        sleep 1
-        next if !@browser.find_elements(css: '.modal')[0]
-
-        exists = true
-      end
-      if !exists
-        reload
-        sleep 4
-        shortcut(key: 'h')
-        (1..4).each do |_count|
-          sleep 1
-          next if !@browser.find_elements(css: '.modal')[0]
-
-          exists = true
-        end
-      end
-      if !exists
-        shortcut(key: 'h')
-      end
-    end
-
-    modal_ready
-    # hide shortkeys
-    shortcut(key: 'h')
-    modal_disappear
-
-    # show shortkeys
-    shortcut(key: 'h')
-    modal_ready
-
-    # show notifications
-    shortcut(key: 'a')
-    watch_for(
-      css:     '.js-notificationsContainer .js-header',
-      value:   'Notification',
-      timeout: 10,
-    )
-
-    shortcut(key: 'a')
-    watch_for_disappear(
-      css:     '.js-notificationsContainer .js-header',
-      value:   'Notification',
-      timeout: 2,
-    )
-
-    # go to overviews
-    shortcut(key: 'o')
-    watch_for(
-      css:     '.active.content',
-      value:   'My assigned Tickets',
-      timeout: 2,
-    )
-
-    # go to dashboard
-    shortcut(key: 'd')
-    watch_for(
-      css:     '.active.content',
-      value:   'My Stats',
-      timeout: 2,
-    )
-
-    # go to new ticket
-    shortcut(key: 'n')
-    watch_for(
-      css:     '.active.content',
-      value:   'New Ticket',
-      timeout: 2,
-    )
-
-    # close again
-    shortcut(key: 'w')
-
-    watch_for_disappear(
-      css:     '.active.content',
-      value:   'New Ticket',
-      timeout: 2,
-    )
-
-    ticket1 = ticket_create(
-      data: {
-        customer: 'nico',
-        group:    'Users',
-        title:    'Test Ticket for Shortcuts - ABC123',
-        body:     'Test Ticket Body for Shortcuts - ABC123',
-      },
-    )
-    sleep 5
-
-    # close again
-    shortcut(key: 'w')
-    watch_for_disappear(
-      css:     '.active.content',
-      value:   ticket1[:number],
-      timeout: 2,
-    )
-
-    # search it
-    shortcut(key: 's')
-    window_keys(value: ticket1[:number])
-    exists(css: '#navigation .search.open')
-    sleep 2
-    window_keys(value: :arrow_down)
-    window_keys(value: :arrow_down)
-    window_keys(value: :enter)
-    watch_for(
-      css:     '.active.content',
-      value:   ticket1[:number],
-      timeout: 2,
-    )
-    exists_not(css: '#navigation .search.open')
-
-    # open ticket
-    shortcut(key: 's')
-    window_keys(value: ticket1[:number])
-    sleep 2
-    window_keys(value: :arrow_down)
-    window_keys(value: :arrow_down)
-    window_keys(value: :enter)
-
-    # open new ticket
-    shortcut(key: 'n')
-    watch_for(
-      css:     '.active.content',
-      value:   'New Ticket',
-      timeout: 2,
-    )
-
-    tab_count = @browser.find_elements(css: '#navigation .tasks .task').count
-    assert_equal(2, tab_count)
-
-    # tab is tab
-    shortcut(key: :tab)
-    watch_for(
-      css:     '.active.content',
-      value:   ticket1[:number],
-      timeout: 2,
-    )
-    shortcut(key: 'm')
-    shortcut(key: 'j')
-    window_keys(value: 'some note')
-    sleep 1
-    shortcut(key: :enter)
-    watch_for(
-      css:     '.active.content .ticket-article',
-      value:   'some note',
-      timeout: 6,
-    )
-    exists(css: '.active.content .ticket-article .internal-border')
-
-    shortcut(key: 'g')
-    window_keys(value: 'some reply')
-    sleep 1
-    shortcut(key: :enter)
-    watch_for(
-      css:     '.active.content .ticket-article',
-      value:   'some reply',
-      timeout: 6,
-    )
-
-    shortcut(key: 'c')
-    watch_for(
-      css:     '.active.content .sidebar-content .edit',
-      value:   'closed',
-      timeout: 6,
-    )
-
-    # open online notification
-    @browser_agent = browser_instance
-    login(
-      browser:  @browser_agent,
-      username: 'agent1@example.com',
-      password: 'test',
-      url:      browser_url,
-    )
-    ticket2 = ticket_create(
-      browser: @browser_agent,
-      data:    {
-        customer: 'nico',
-        group:    'Users',
-        title:    'Test Ticket for Shortcuts II - ABC123',
-        body:     'Test Ticket Body for Shortcuts II - ABC123',
-      },
-    )
-    sleep 5
-    shortcut(key: 'a')
-    # flanky
-    watch_for(
-      css:     '.js-notificationsContainer',
-      value:   'Test Ticket for Shortcuts II',
-      timeout: 10,
-    )
-    window_keys(value: :arrow_down)
-    window_keys(value: :enter)
-    watch_for(
-      css:     '.active.content',
-      value:   ticket2[:number],
-      timeout: 3,
-    )
-
-    shortcut(key: 'e')
-    watch_for(
-      css:     '#login',
-      value:   'username',
-      timeout: 4,
-    )
-  end
-end