diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0870bf6782f..f2202563456 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2851,7 +2851,10 @@ try matching its doc string against `custom-guess-doc-alist'."
       (when-let* ((widget (widget-at (point)))
                   (parent (widget-get widget :parent))
                   (state (widget-get parent :custom-state)))
-        (when (eq state custom--hidden-state)
+        (when (eq state 'changed)
+          (setq state 'standard))
+        (when (and (eq (widget-type widget) 'custom-visibility)
+                   (eq state custom--hidden-state))
           (custom-toggle-hide-variable widget)))
       (forward-line 1)))
   (setq custom--hidden-state (if (eq custom--hidden-state 'hidden)