diff --git a/ChangeLog b/ChangeLog
index 7f7924be..2d46921b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4318,6 +4318,8 @@ v0.33.19        26-Oct-2001
 		fetching of newsgroups headers.
 		The edit field now shows the contents correctly if the field
 		contains the % character.
+		In several menus after leaving a edit record records were
+		displayed from start again, now shows last screen.
 
 	mbsebbs:
 		Added menu 317, change FS editor shortcut keys to (Emacs/
diff --git a/mbsetup/m_domain.c b/mbsetup/m_domain.c
index 67362e1e..d71db55c 100644
--- a/mbsetup/m_domain.c
+++ b/mbsetup/m_domain.c
@@ -444,8 +444,10 @@ void EditDomain(void)
 			if ((o - 10) >= 0)
 				o = o - 10;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditDomainRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 10) * 10;
+		}
 	}
 }
 
diff --git a/mbsetup/m_farea.c b/mbsetup/m_farea.c
index 2271fd98..dd7b2bdd 100644
--- a/mbsetup/m_farea.c
+++ b/mbsetup/m_farea.c
@@ -510,8 +510,10 @@ void EditFilearea(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditFileRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_ff.c b/mbsetup/m_ff.c
index 45f20bd3..c3063668 100644
--- a/mbsetup/m_ff.c
+++ b/mbsetup/m_ff.c
@@ -404,8 +404,10 @@ void EditFilefind(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditFfRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c
index cc8bec9f..1b59ac51 100644
--- a/mbsetup/m_fgroup.c
+++ b/mbsetup/m_fgroup.c
@@ -445,8 +445,10 @@ void EditFGroup(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditFGrpRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_hatch.c b/mbsetup/m_hatch.c
index 99c7577a..9a2190bf 100644
--- a/mbsetup/m_hatch.c
+++ b/mbsetup/m_hatch.c
@@ -541,8 +541,10 @@ void EditHatch(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditHatchRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_magic.c b/mbsetup/m_magic.c
index fa5776d9..ec2602cc 100644
--- a/mbsetup/m_magic.c
+++ b/mbsetup/m_magic.c
@@ -471,8 +471,10 @@ void EditMagics(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditMagicRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_mgroup.c b/mbsetup/m_mgroup.c
index 3271291a..a772a7c9 100644
--- a/mbsetup/m_mgroup.c
+++ b/mbsetup/m_mgroup.c
@@ -442,8 +442,10 @@ void EditMGroup(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditMGrpRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_new.c b/mbsetup/m_new.c
index 2616dfc1..d295208b 100644
--- a/mbsetup/m_new.c
+++ b/mbsetup/m_new.c
@@ -514,8 +514,10 @@ void EditNewfiles(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditNewRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_ngroup.c b/mbsetup/m_ngroup.c
index d610bbfa..a6703b7a 100644
--- a/mbsetup/m_ngroup.c
+++ b/mbsetup/m_ngroup.c
@@ -394,8 +394,10 @@ void EditNGroup(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditNGrpRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c
index 348d48e0..bdf15262 100644
--- a/mbsetup/m_node.c
+++ b/mbsetup/m_node.c
@@ -974,8 +974,10 @@ void EditNodes(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditNodeRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_ol.c b/mbsetup/m_ol.c
index 1431f43f..1f3d7edc 100644
--- a/mbsetup/m_ol.c
+++ b/mbsetup/m_ol.c
@@ -380,8 +380,10 @@ void EditOneline(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditOnelRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_service.c b/mbsetup/m_service.c
index ce080b71..cab4b591 100644
--- a/mbsetup/m_service.c
+++ b/mbsetup/m_service.c
@@ -394,8 +394,10 @@ void EditService(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditServiceRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }
 
diff --git a/mbsetup/m_users.c b/mbsetup/m_users.c
index 4871a035..4565b9e5 100644
--- a/mbsetup/m_users.c
+++ b/mbsetup/m_users.c
@@ -589,8 +589,10 @@ void EditUsers(void)
 			if ((o - 20) >= 0)
 				o = o - 20;
 
-		if ((atoi(pick) >= 1) && (atoi(pick) <= records))
+		if ((atoi(pick) >= 1) && (atoi(pick) <= records)) {
 			EditUsrRec(atoi(pick));
+			o = ((atoi(pick) - 1) / 20) * 20;
+		}
 	}
 }