diff --git a/src/ChangeLog b/src/ChangeLog
index 91bd0e1137c..006e5c4b4a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
+
 2014-10-31  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* macfont.m (macfont_glyph_extents): Turn off syntetic bold
diff --git a/src/nsfns.m b/src/nsfns.m
index 4fa62f56851..8129c9e2a41 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -641,8 +641,12 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
     {
       BOOL edited = NO;
       struct frame *f = XFRAME (frame);
-      struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
-      NSView *view = FRAME_NS_VIEW (f);
+      struct window *w;
+      NSView *view;
+
+      if (! FRAME_NS_P (f)) continue;
+      w = XWINDOW (FRAME_SELECTED_WINDOW (f));
+      view = FRAME_NS_VIEW (f);
       if (!MINI_WINDOW_P (w))
         edited = ! NILP (Fbuffer_modified_p (w->contents)) &&
           ! NILP (Fbuffer_file_name (w->contents));