=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2011-03-07 04:29:13 +0000
+++ openshot/windows/MainGTK.py	2011-08-02 17:36:11 +0000
@@ -3894,7 +3894,7 @@
 				mnuThumbView.connect('activate',self.on_mnuThumbView_activate)
 				self.mnuTree.add(mnuThumbView)
 				
-				#Move Files to folder
+				# Move Files to folder
 				mnuMoveFile = gtk.ImageMenuItem(gtk.STOCK_GO_FORWARD)
 				mnuMoveFile.get_children()[0].set_label(_("Move File(s) to Folder"))
 				self.mnuTree.add(mnuMoveFile)
@@ -3902,23 +3902,29 @@
 				folders =  self.project.project_folder.ListFolders()
 				mnuSubMenu = gtk.Menu()
 				
-				#populate the sub menu with available folders
-				for folder in folders:
-					item = gtk.ImageMenuItem(gtk.STOCK_OPEN)
-					item.get_children()[0].set_label(folder)					
-					item.connect("activate", self.move_file_to_folder, folder)
-					mnuSubMenu.add(item)
-					
-				#add remove from folder
 				if folders:
+				
+					# populate the sub menu with available folders
+					for folder in folders:
+						item = gtk.ImageMenuItem(gtk.STOCK_OPEN)
+						item.get_children()[0].set_label(folder)					
+						item.connect("activate", self.move_file_to_folder, folder)
+						mnuSubMenu.add(item)
+					
+					# add separator
 					mnuSeparator = gtk.SeparatorMenuItem()
 					mnuSubMenu.add(mnuSeparator)
 					
+					# add "Remove from Folder"
 					item = gtk.ImageMenuItem(gtk.STOCK_REMOVE)
 					item.get_children()[0].set_label(_("Remove from Folder"))					
 					item.connect("activate", self.move_file_to_folder, _("Remove from Folder"))
 					mnuSubMenu.add(item)
 				
+				else:
+					# Gray out the "Move File(s) to Folder option"
+					mnuMoveFile.set_sensitive(False)
+				
 				# add sub-menu to menu
 				mnuMoveFile.set_submenu(mnuSubMenu)
 			else: