diff --git a/amiga/arexx.c b/amiga/arexx.c
index 02e0e1e23..23175470a 100755
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -23,7 +23,6 @@
 #include "amiga/gui.h"
 #include "amiga/options.h"
 #include "desktop/browser.h"
-#include "desktop/history_core.h"
 #include "utils/testament.h"
 
 #include <string.h>
@@ -431,13 +430,7 @@ STATIC VOID rx_back(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
 	if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1]))
 		bw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]);
 
-	if(bw)
-	{
-		if(browser_window_back_available(bw))
-		{
-			history_back(bw, bw->history);
-		}
-	}
+	if(bw) ami_gui_history(bw->window->shared, true);
 }
 
 STATIC VOID rx_forward(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
@@ -449,13 +442,8 @@ STATIC VOID rx_forward(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((
 	if((cmd->ac_ArgList[0]) && (cmd->ac_ArgList[1]))
 		bw = ami_find_tab(*(ULONG *)cmd->ac_ArgList[0], *(ULONG *)cmd->ac_ArgList[1]);
 
-	if(bw)
-	{
-		if(browser_window_forward_available(bw))
-		{
-			history_forward(bw, bw->history);
-		}
-	}
+	if(bw) ami_gui_history(bw->window->shared, false);
+
 }
 
 STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
diff --git a/amiga/gui.h b/amiga/gui.h
index c31d2cc1a..dc7b847da 100755
--- a/amiga/gui.h
+++ b/amiga/gui.h
@@ -138,6 +138,7 @@ STRPTR ami_locale_langs(void);
 int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie);
 struct box *ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y);
 BOOL ami_gadget_hit(Object *obj, int x, int y);
+void ami_gui_history(struct gui_window_2 *gwin, bool back);
 
 struct TextFont *origrpfont;
 struct MinList *window_list;