diff --git a/amiga/gui.c b/amiga/gui.c
index ff1f72ef9..57159e2c8 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -467,7 +467,7 @@ void gui_init(int argc, char** argv)
 	ami_get_theme_filename(throbberfile,"theme_throbber");
 	throbber_frames=atoi(messages_get("theme_throbber_frames"));
 	throbber_update_interval = atoi(messages_get("theme_throbber_delay"));
-	if(throbber_update_interval == 0) throbber_update_interval = 1000;
+	if(throbber_update_interval == 0) throbber_update_interval = 100;
 
 	if(dto = NewDTObject(throbberfile,
 					DTA_GroupID,GID_PICTURE,
@@ -2353,6 +2353,8 @@ void gui_window_update_box(struct gui_window *g,
 {
 	ULONG sx,sy;
 
+	if(!g) return;
+
 	GetAttr(SCROLLER_Top,g->shared->objects[OID_HSCROLL],(ULONG *)&sx);
 	GetAttr(SCROLLER_Top,g->shared->objects[OID_VSCROLL],(ULONG *)&sy);
 
diff --git a/amiga/resources/Themes/AISS/Theme b/amiga/resources/Themes/AISS/Theme
index d686bda06..6b1203564 100755
--- a/amiga/resources/Themes/AISS/Theme
+++ b/amiga/resources/Themes/AISS/Theme
@@ -29,7 +29,7 @@ theme_list_history:*TBImages:list_archive
 theme_list_sslcert:*TBImages:list_crypt
 theme_throbber:Throbber
 theme_throbber_frames:13
-theme_throbber_delay:500
+theme_throbber_delay:100
 ptr_default:*PROGDIR:Resources/Pointers/Default
 ptr_point:*PROGDIR:Resources/Pointers/Point
 ptr_caret:*PROGDIR:Resources/Pointers/Caret
diff --git a/amiga/resources/Themes/Default/Theme b/amiga/resources/Themes/Default/Theme
index 58464dd85..fb63a71d0 100755
--- a/amiga/resources/Themes/Default/Theme
+++ b/amiga/resources/Themes/Default/Theme
@@ -42,7 +42,7 @@ theme_list_history:
 theme_list_sslcert:
 theme_throbber:Throbber
 theme_throbber_frames:9
-theme_throbber_delay:500
+theme_throbber_delay:100
 ptr_default:*PROGDIR:Resources/Pointers/Default
 ptr_point:*PROGDIR:Resources/Pointers/Point
 ptr_caret:*PROGDIR:Resources/Pointers/Caret