diff --git a/apps/finder/finder.py b/apps/finder/finder.py
index f5aec59982..fc83818175 100644
--- a/apps/finder/finder.py
+++ b/apps/finder/finder.py
@@ -16,12 +16,6 @@ class UserActions:
     def file_manager_open_parent():
         actions.key("cmd-up")
 
-    def file_manager_go_forward():
-        actions.key("cmd-]")
-
-    def file_manager_go_back():
-        actions.key("cmd-[")
-
     def file_manager_current_path():
         title = ui.active_window().title
 
diff --git a/apps/nautilus/nautilus.py b/apps/nautilus/nautilus.py
index 5cdebb40ad..9a75c844e0 100644
--- a/apps/nautilus/nautilus.py
+++ b/apps/nautilus/nautilus.py
@@ -35,13 +35,14 @@ class UserActions:
     def tab_jump(number: int):
         actions.key(f"alt-{number}")
 
-    # user.file_manager
-    def file_manager_go_back():
+    # user.navigation
+    def go_back():
         actions.key("alt-left")
 
-    def file_manager_go_forward():
+    def go_forward():
         actions.key("alt-right")
 
+    # user.file_manager
     def file_manager_open_parent():
         actions.key("alt-up")
 
diff --git a/apps/powershell/powershell_win.py b/apps/powershell/powershell_win.py
index 42b641a0fd..a592e58a4b 100644
--- a/apps/powershell/powershell_win.py
+++ b/apps/powershell/powershell_win.py
@@ -25,10 +25,6 @@ def file_manager_refresh_title():
             "$Host.UI.RawUI.WindowTitle = 'Windows PowerShell: ' +  $(get-location)"
         )
         actions.key("enter")
-        # action(user.file_manager_go_back):
-        #    key("alt-left")
-        # action(user.file_manager_go_forward):
-        #    key("alt-right")
 
     def file_manager_open_parent():
         actions.insert("cd ..")
diff --git a/apps/windows_command_processor/command_processor_actions_win.py b/apps/windows_command_processor/command_processor_actions_win.py
index 2024beeccb..20ebaf17e7 100644
--- a/apps/windows_command_processor/command_processor_actions_win.py
+++ b/apps/windows_command_processor/command_processor_actions_win.py
@@ -14,10 +14,6 @@ class UserActions:
     def file_manager_refresh_title():
         actions.insert("title Command Prompt: %CD%")
         actions.key("enter")
-        # action(user.file_manager_go_back):
-        #    key("alt-left")
-        # action(user.file_manager_go_forward):
-        #    key("alt-right")
 
     def file_manager_open_parent():
         actions.insert("cd ..")
diff --git a/apps/windows_command_processor/command_processor_win.py b/apps/windows_command_processor/command_processor_win.py
index 6e5e5a0be0..389178ce11 100644
--- a/apps/windows_command_processor/command_processor_win.py
+++ b/apps/windows_command_processor/command_processor_win.py
@@ -27,10 +27,6 @@ class UserActions:
     def file_manager_refresh_title():
         actions.insert("title Command Prompt: %CD%")
         actions.key("enter")
-        # action(user.file_manager_go_back):
-        #    key("alt-left")
-        # action(user.file_manager_go_forward):
-        #    key("alt-right")
 
     def file_manager_open_parent():
         actions.insert("cd ..")
diff --git a/apps/windows_explorer/windows_explorer.py b/apps/windows_explorer/windows_explorer.py
index 5d3700c761..1943d6d28d 100644
--- a/apps/windows_explorer/windows_explorer.py
+++ b/apps/windows_explorer/windows_explorer.py
@@ -86,11 +86,6 @@
 
 @ctx.action_class("user")
 class UserActions:
-    def file_manager_go_back():
-        actions.key("alt-left")
-
-    def file_manager_go_forward():
-        actions.key("alt-right")
 
     def file_manager_open_parent():
         actions.key("alt-up")
diff --git a/core/navigation/navigation.py b/core/navigation/navigation.py
new file mode 100644
index 0000000000..bb76ff9bdf
--- /dev/null
+++ b/core/navigation/navigation.py
@@ -0,0 +1,43 @@
+from talon import Context, Module, actions
+
+mod = Module()
+mod.tag("navigation")
+
+ctx_browser = Context()
+ctx_browser.matches = r"""
+tag: browser
+"""
+
+ctx_mac = Context()
+ctx_mac.matches = r"""
+os: mac
+"""
+
+
+@ctx_browser.action_class("user")
+class BrowserActions:
+    def go_back():
+        actions.browser.go_back()
+
+    def go_forward():
+        actions.browser.go_forward()
+
+
+@ctx_mac.action_class("user")
+class MacActions:
+    def go_back():
+        actions.key("cmd-]")
+
+    def go_forward():
+        actions.key("cmd-[")
+
+
+@mod.action_class
+class Actions:
+    def go_back():
+        """Navigate back"""
+        actions.key("alt-left")
+
+    def go_forward():
+        """Navigate forward"""
+        actions.key("alt-right")
diff --git a/core/navigation/navigation.talon b/core/navigation/navigation.talon
new file mode 100644
index 0000000000..18bfd2ea23
--- /dev/null
+++ b/core/navigation/navigation.talon
@@ -0,0 +1,5 @@
+tag: user.navigation
+-
+
+go back: user.go_back()
+go forward: user.go_forward()
diff --git a/tags/browser/browser.talon b/tags/browser/browser.talon
index 852cedaf6b..0eb6ab6ebc 100644
--- a/tags/browser/browser.talon
+++ b/tags/browser/browser.talon
@@ -1,5 +1,7 @@
 tag: browser
 -
+tag(): user.navigation
+
 address bar | go address | go url: browser.focus_address()
 go page | page focus: browser.focus_page()
 address copy | url copy | copy address | copy url:
@@ -7,8 +9,6 @@ address copy | url copy | copy address | copy url:
     sleep(50ms)
     edit.copy()
 go home: browser.go_home()
-[go] forward: browser.go_forward()
-go (back | backward): browser.go_back()
 go to {user.website}: browser.go(website)
 go private: browser.open_private_window()
 
diff --git a/tags/file_manager/file_manager.py b/tags/file_manager/file_manager.py
index c965b3d9e3..525790121b 100644
--- a/tags/file_manager/file_manager.py
+++ b/tags/file_manager/file_manager.py
@@ -79,12 +79,6 @@ def file_manager_open_parent():
         """file_manager_open_parent"""
         return
 
-    def file_manager_go_forward():
-        """file_manager_go_forward_directory"""
-
-    def file_manager_go_back():
-        """file_manager_go_forward_directory"""
-
     def file_manager_open_volume(volume: str):
         """file_manager_open_volume"""
 
diff --git a/tags/file_manager/file_manager.talon b/tags/file_manager/file_manager.talon
index 13c839d5cf..aa4dd8ff1a 100644
--- a/tags/file_manager/file_manager.talon
+++ b/tags/file_manager/file_manager.talon
@@ -1,12 +1,12 @@
 tag: user.file_manager
 -
+tag(): user.navigation
+
 title force: user.file_manager_refresh_title()
 manager show: user.file_manager_toggle_pickers()
 manager close: user.file_manager_hide_pickers()
 manager refresh: user.file_manager_update_lists()
 go <user.system_path>: user.file_manager_open_directory(system_path)
-go back: user.file_manager_go_back()
-go forward: user.file_manager_go_forward()
 (go parent | daddy): user.file_manager_open_parent()
 ^follow numb <number_small>$:
     directory = user.file_manager_get_directory_by_index(number_small - 1)