diff --git a/debian/changelog b/debian/changelog
index c8b7bfc..fb61dd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mintmenu (4.9.4) helena; urgency=low
+
+  * Fixed: spaces in custom places and/or desktop directory
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sun,  3 Jan 2009 12:50:00 +0000
+
 mintmenu (4.9.3) helena; urgency=low
 
   * Fixed: https://bugs.launchpad.net/linuxmint/+bug/496730
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py
index e0d57d1..2f2a3f7 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/places.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.py
@@ -176,7 +176,7 @@ class pluginclass( object ):
 			except Exception, detail:
 				print detail
 			Button4 = easyButton( "gnome-fs-desktop", self.iconsize, [_("Desktop")], -1, -1 )
-			Button4.connect( "clicked", self.ButtonClicked, "nautilus " + desktopDir )
+			Button4.connect( "clicked", self.ButtonClicked, "nautilus \"" + desktopDir + "\"")
 			Button4.show()
 			self.placesBtnHolder.pack_start( Button4, False, False )
 			self.mintMenuWin.setTooltip( Button4, _("Browse items placed on the desktop") )
@@ -192,7 +192,7 @@ class pluginclass( object ):
 			
 	def do_custom_places( self ):		
 		for index in range( len(self.custompaths) ):
-			command = ( "nautilus " + self.custompaths[index] )
+			command = ( "nautilus \"" + self.custompaths[index] + "\"")
 			currentbutton = easyButton( "folder", self.iconsize, [self.customnames[index]], -1, -1 )
 			currentbutton.connect( "clicked", self.ButtonClicked, command )
 			currentbutton.show()