diff --git a/ede-desktop/Desktop.cpp b/ede-desktop/Desktop.cpp
index ab3df29..b7b50cc 100644
--- a/ede-desktop/Desktop.cpp
+++ b/ede-desktop/Desktop.cpp
@@ -384,6 +384,9 @@ DesktopIcon *Desktop::read_desktop_file(const char *path, const char *base, Desk
 			ret->set_image(buf);
 		else
 			ret->set_image(NULL);
+		
+		if(df.comment(buf, sizeof(buf)))
+			ret->set_tooltip(buf);
 	
 		if(df.exec(buf, sizeof(buf))) ret->set_cmd(buf);
 	}
diff --git a/ede-desktop/DesktopIcon.cpp b/ede-desktop/DesktopIcon.cpp
index bcbaf9b..a901001 100644
--- a/ede-desktop/DesktopIcon.cpp
+++ b/ede-desktop/DesktopIcon.cpp
@@ -152,6 +152,10 @@ void DesktopIcon::set_image(const char *name) {
 		size(img_w + OFFSET_W, img_h + OFFSET_H);
 }
 
+void DesktopIcon::set_tooltip(const char *tip) {
+	copy_tooltip(tip);
+}
+
 void DesktopIcon::update_label_font_and_size(void) {
 	E_RETURN_IF_FAIL(opts != 0);
 
diff --git a/ede-desktop/DesktopIcon.h b/ede-desktop/DesktopIcon.h
index 712540a..4883515 100644
--- a/ede-desktop/DesktopIcon.h
+++ b/ede-desktop/DesktopIcon.h
@@ -97,6 +97,7 @@ public:
 	void set_icon_type(int c) { icon_type = c; }
 	int  get_icon_type(void) { return icon_type;}
 	void set_image(const char *name);
+	void set_tooltip(const char *tip);
 
 	void update_label_font_and_size(void);