diff --git a/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy b/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy
index ff2d96258..13945a38f 100644
--- a/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy
+++ b/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy
@@ -2385,7 +2385,7 @@ class ScreenRenderImpl implements ScreenRender {
                 for (Map<String, Object> userFlf in userFlfList) {
                     EntityValue formListFind = (EntityValue) userFlf.formListFind
                     Map itemMap = [name:formListFind.formListFindId, title:formListFind.description, image:lastImage, imageType:lastImageType,
-                            path:lastPath, pathWithParams:(lastPath + "?formListFindId=" + formListFind.formListFindId)]
+                            path:lastPath, pathWithParams:(currentPath.toString() + (paramString.length() > 0 ? '&' : '?') + "formListFindId=" + formListFind.formListFindId)]
                     if (formListFindId != null && formListFindId.equals(formListFind.formListFindId)) itemMap.active = true
                     savedFindsList.add(itemMap)
                 }