diff --git a/amiga/gui.c b/amiga/gui.c
index 347fcde23..ce3967582 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2209,7 +2209,7 @@ void ami_switch_tab(struct gui_window_2 *gwin,bool redraw)
 		return;
 	}
 
-	ami_plot_release_pens(&g->shared->shared_pens);
+	ami_plot_release_pens(&gwin->shared_pens);
 	ami_update_buttons(gwin);
 	ami_menu_update_disabled(gwin->bw->window, gwin->bw->current_content);
 
@@ -2575,7 +2575,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 		return NULL;
 	}
 
-	NewList(&g->shared->shared_pens);
+	NewMinList(&g->shared->shared_pens);
 	
 	g->shared->scrollerhook.h_Entry = (void *)ami_scroller_hook;
 	g->shared->scrollerhook.h_Data = g->shared;
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 34f596474..85376381d 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -254,7 +254,7 @@ void ami_plot_setapen(ULONG colour)
 			p96EncodeColor(RGBFF_A8B8G8R8, colour),
 			TAG_DONE);
 	} else {
-		ULONG pen = ami_plot_obtain_pen(gg->shared_pens, colour);
+		ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour);
 		if(pen != -1) SetAPen(glob->rp, pen);
 	}
 }
@@ -266,7 +266,7 @@ void ami_plot_setopen(ULONG colour)
 			p96EncodeColor(RGBFF_A8B8G8R8, colour),
 			TAG_DONE);
 	} else {
-		ULONG pen = ami_plot_obtain_pen(gg->shared_pens, colour);
+		ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour);
 		if(pen != -1) SetOPen(glob->rp, pen);
 	}
 }