diff --git a/src/dialogs.py b/src/dialogs.py
index f2938e3df..6a996d735 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -625,6 +625,8 @@ class ChangeStatusMessageDialog:
 #			gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category'])
 			if self.pep_dict['activity_text']:
 				label.set_text(self.pep_dict['activity_text'])
+			else:
+				label.set_text('')
 		else:
 			img.set_from_pixbuf(None)
 			label.set_text('')
@@ -638,6 +640,8 @@ class ChangeStatusMessageDialog:
 				self.pep_dict['mood']).get_pixbuf())
 			if self.pep_dict['mood_text']:
 				label.set_text(self.pep_dict['mood_text'])
+			else:
+				label.set_text('')
 		else:
 			img.set_from_pixbuf(None)
 			label.set_text('')