diff -Naur Thunar-0.9.0/thunar/thunar-shortcuts-view.c Thunar-0.9.0.tpg/thunar/thunar-shortcuts-view.c
--- Thunar-0.9.0/thunar/thunar-shortcuts-view.c	2007-12-02 13:46:32.000000000 +0000
+++ Thunar-0.9.0.tpg/thunar/thunar-shortcuts-view.c	2007-12-17 01:09:25.000000000 +0000
@@ -834,13 +834,12 @@
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
       gtk_widget_show (item);
 
-      /* check if the volume is a disc */
-      if (thunar_vfs_volume_is_disc (volume))
+      /* check if the volume is ejectable */
+      if (thunar_vfs_volume_is_ejectable (volume))
         {
           /* append the "Eject Volume" menu action */
           item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
           g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_eject), view);
-          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
           gtk_widget_show (item);
         }
diff -Naur Thunar-0.9.0/thunar/thunar-tree-view.c Thunar-0.9.0.tpg/thunar/thunar-tree-view.c
--- Thunar-0.9.0/thunar/thunar-tree-view.c	2007-12-02 13:46:33.000000000 +0000
+++ Thunar-0.9.0.tpg/thunar/thunar-tree-view.c	2007-12-17 01:09:25.000000000 +0000
@@ -1041,13 +1041,12 @@
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
       gtk_widget_show (item);
 
-      /* check if the volume is a disc */
-      if (thunar_vfs_volume_is_disc (volume))
+      /* check if the volume is ejectable */
+      if (thunar_vfs_volume_is_ejectable (volume))
         {
           /* append the "Eject Volume" menu action */
           item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
           g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
-          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
           gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
           gtk_widget_show (item);
         }