diff --git a/ChangeLog b/ChangeLog
index 96605ed6..842acb3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4602,8 +4602,10 @@ v0.33.20        10-Feb-2002
 		creation.
 		Added servicename filemgr to the filemgr services.
 		When adding or deleting a message area, several extra checks
-		are done.
+		are done. The JAM base is also removed when deleting.
 		Layout for message area editor changed, more logical now.
+		If selecting a file/mailgroup in node edit that is outside the
+		visible range of groups, the view is adjusted.
 
 	mbfido:
 		In AreaMgr and FileMgr changed aka matching for area 
diff --git a/mbsetup/grlist.c b/mbsetup/grlist.c
index 1807725d..4fa148d2 100644
--- a/mbsetup/grlist.c
+++ b/mbsetup/grlist.c
@@ -186,6 +186,17 @@ int E_Group(gr_list **fdp, char *title)
 						tmp->tagged = TRUE;
 					}
 				    }
+				    if (o != ((i -1) / 40) * 40) {
+					/*
+					 * If a group is selected outside the visible
+					 * range, change the groupview.
+					 */
+					o = ((i -1) / 40) * 40;
+					clr_index();
+					set_color(WHITE, BLACK);
+					mvprintw(5, 5, (char *)"%s", title);
+					set_color(CYAN, BLACK);
+				    }
 				}
 				break;
 		}