diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 48038d3ba..deedb0b22 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,12 +9,17 @@ http://www.tuxpaint.org/
 $Id$
 
 
-2007.November.27 (0.9.19)
+2007.December.1 (0.9.19)
   * Localization Updates:
     ---------------------
     * Danish translation
       Joe Hansen <joedalton2@yahoo.dk>
 
+  * Bug Fixes
+    ---------
+    * Corrected bug where Shift and Kaleidoscope magic tools would crash
+      when sound was disabled.
+
 
 2007.November.17 (0.9.18)
   * Interface Improvements:
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 502a668c2..bd6ca8fa9 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - November 21, 2007
+  June 14, 2002 - December 1, 2007
   $Id$
 */
 
@@ -17181,7 +17181,10 @@ void special_notify(int flags)
 void magic_stopsound(void)
 {
 #ifndef NOSOUND
- Mix_HaltChannel(0);
+  if (mute || !use_sound)
+    return;
+
+  Mix_HaltChannel(0);
 #endif
 }