diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 66d702434..d8addfd67 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-01  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Grzegorz Dymarek <gregd@interia.pl>
+
+	* gnome-settings-multimedia-keys.c: (do_sound_action): don't
+	unmute when lowering the volume and switch to muted when the
+	volume reaches 0 (closes bug #337896)
+
 2007-07-01  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-settings-background.c:
diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
index 8bab949a8..63722a41a 100644
--- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
@@ -640,11 +640,9 @@ do_sound_action (Acme *acme, int type)
 		acme_volume_mute_toggle (acme->volobj);
 		break;
 	case VOLUME_DOWN_KEY:
-		if (muted) {
-			acme_volume_mute_toggle(acme->volobj);
-		} else {
-			acme_volume_set_volume (acme->volobj, vol - vol_step);
-		}
+		if (!muted && (vol <= vol_step))
+			acme_volume_mute_toggle (acme->volobj);
+		acme_volume_set_volume (acme->volobj, vol - vol_step);
 		break;
 	case VOLUME_UP_KEY:
 		if (muted) {