diff --git a/server/song.ajax.php b/server/song.ajax.php
index ae277675..1409ff15 100644
--- a/server/song.ajax.php
+++ b/server/song.ajax.php
@@ -34,8 +34,12 @@ switch ($_REQUEST['action']) {
 		$song = new Song($_REQUEST['song_id']); 
 		$new_enabled = $song->enabled ? '0' : '1'; 
 		$song->update_enabled($new_enabled,$song->id); 
+		$song->enabled = $new_enabled; 
+		$song->format(); 
 
-		//FIXME: Re-display this	
+		ob_start(); 
+		require Config::get('prefix') . '/templates/show_song_row.inc.php'; 
+		$results['song_' . $song->id] = ob_get_clean(); 
 
 	break;
 	default: 
diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php
index 82b0cf4b..2685417b 100644
--- a/templates/show_song_row.inc.php
+++ b/templates/show_song_row.inc.php
@@ -47,5 +47,7 @@
 	<?php } ?>
 	<?php if (Access::check('interface','75')) { ?>
 		<?php echo Ajax::button('?action=show_edit_object&type=song&id=' . $song->id,'edit',_('Edit'),'edit_song_' . $song->id); ?>
+		<?php $icon = $song->enabled ? 'disable' : 'enable'; ?>
+		<?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon,_(ucfirst($icon)),'flip_song_' . $song->id); ?> 
 	<?php } ?>
 </td>