diff --git a/aquamacs/doc/latex/changelog.tex b/aquamacs/doc/latex/changelog.tex
index 38372f5777a1..7ba0b1b01e22 100644
--- a/aquamacs/doc/latex/changelog.tex
+++ b/aquamacs/doc/latex/changelog.tex
@@ -8,6 +8,7 @@ \subsection{Changes--- dev}
 Suggested by Juan Jose Garcia Ripoll.
 \item Text search (isearch) now works better when using one of the Emulate-Mac-Keyboard-Modes.
 Reported by Thomas Strathmann.
+\item Frames are now reliably moved inside the current display again when entering the minibuffer (and at other times).
 \end{itemize}
 
 \subsection{Changes--- 2.4}
diff --git a/aquamacs/src/site-lisp/smart-frame-positioning.el b/aquamacs/src/site-lisp/smart-frame-positioning.el
index 3711e93180da..a1bf3f9bb1f5 100644
--- a/aquamacs/src/site-lisp/smart-frame-positioning.el
+++ b/aquamacs/src/site-lisp/smart-frame-positioning.el
@@ -722,7 +722,7 @@ Returns nil of parms is nil."
 ; (setq frame (selected-frame))
 ; (smart-move-minibuffer-inside-screen)
 (defun smart-move-minibuffer-inside-screen (&optional frame)
-  (when (and (frame-parameter (or frame (selected-frame)) 'window-system)
+  (when (and (display-graphic-p frame)
 	     (not (frame-parameter frame 'fullscreen)))
     (unless
 	(smart-minibuffer-inside-screen-p frame)
@@ -740,7 +740,7 @@ boundaries.
 The function will fail to do its job when the Dock is not displayed
 on the main screen, i.e. where the menu is."
   (interactive)
-  (when (frame-parameter (or frame (selected-frame)) 'window-system)
+  (when (display-graphic-p frame)
     (let* ((frame (or frame (selected-frame)))
 	   ;; on some systems, we can retrieve the available pixel width with
 	   ;; non-standard methods.
@@ -838,4 +838,4 @@ on the main screen, i.e. where the menu is."
 	 (smart-move-frame-inside-screen nil t))))
 
 
-(provide 'smart-frame-positioning) 
\ No newline at end of file
+(provide 'smart-frame-positioning)