diff --git a/ChangeLog b/ChangeLog
index cb01544307..5bfa26f320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-25  Kevin Cozens  <kcozens@cvs.gnome.org>
+
+	* plug-ins/script-fu/scripts/fuzzyborder.scm: Applied patch from
+	Ulf-D. Ehlert which pushes and pops a context to prevent
+	changing background colour in the UI. Fixes bug #479974.
+
 2007-09-24  Matic Zgur  <mr.zgur@gmail.com>
 
 	* configure.in: Added 'sl' to ALL_LINUGAS.
diff --git a/plug-ins/script-fu/scripts/fuzzyborder.scm b/plug-ins/script-fu/scripts/fuzzyborder.scm
index 7dcb69b37b..6359de3ffd 100644
--- a/plug-ins/script-fu/scripts/fuzzyborder.scm
+++ b/plug-ins/script-fu/scripts/fuzzyborder.scm
@@ -42,6 +42,8 @@
        (theLayer)
        )
 
+    (gimp-context-push)
+
     (gimp-selection-all inImage)
     (set! theImage (if (= inCopy TRUE)
                      (car (gimp-image-duplicate inImage))
@@ -126,6 +128,8 @@
       )
     )
     (gimp-displays-flush)
+
+    (gimp-context-pop)
   )
 )