diff --git a/ChangeLog b/ChangeLog
index 85622029..5e3308ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-20 Chris Allegretta <chrisa@asty.org>
+        * src/text.c (do_histify): Don't allow sigwinch to be received while justifying
+          as that puts us into a wacky state.  Fixess crash on justify by Joshua Rogers.
+
 2013-01-19 Chris Allegretta <chrisa@asty.org>
         * configure.ac: Make ncursesw checking dependent on the presence of ncursesw.h, 
           since without the header files we can't compile.
diff --git a/src/text.c b/src/text.c
index d8f80887..9bb7e4e0 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1979,6 +1979,8 @@ void do_justify(bool full_justify)
     if (full_justify)
 	openfile->current = openfile->fileage;
 
+    allow_pending_sigwinch(FALSE);
+
     while (TRUE) {
 	size_t i;
 	    /* Generic loop variable. */
@@ -2349,6 +2351,9 @@ void do_justify(bool full_justify)
     /* Display the shortcut list with UnCut. */
     shortcut_init(FALSE);
     display_main_list();
+
+    allow_pending_sigwinch(TRUE);
+
 }
 
 /* Justify the current paragraph. */