diff --git a/Changelog b/Changelog
index 5057f2576..1450fb066 100644
--- a/Changelog
+++ b/Changelog
@@ -34,6 +34,7 @@
     - BUGFIX: Fixed download button in search engine
     - BUGFIX: Fixed selective download
     - BUGFIX: Fixed memory leaks in torrent properties
+    - BUGFIX: Fixed tooltip behaviour for trayicon
     - COSMETIC: Now displaying the number of downloads in tab title
     - COSMETIC: Redesigned download from url dialog
     - COSMETIC: Added a message to warn user that we started download from an url
diff --git a/src/trayicon/trayicon_x11.cpp b/src/trayicon/trayicon_x11.cpp
index 09940b5c4..897996ad4 100644
--- a/src/trayicon/trayicon_x11.cpp
+++ b/src/trayicon/trayicon_x11.cpp
@@ -231,10 +231,10 @@ void TrayIcon::TrayIconPrivate::enterEvent(QEvent *e)
 		ev.xfocus.mode = NotifyNormal;
 		ev.xfocus.detail = NotifyAncestor;
 
-		unsigned long oldTime = QX11Info::appTime();
-		QX11Info::setAppTime(1);
+// 		unsigned long oldTime = QX11Info::appTime();
+// 		QX11Info::setAppTime(1);
 		qApp->x11ProcessEvent( &ev );
-		QX11Info::setAppTime(oldTime);
+// 		QX11Info::setAppTime(oldTime);
 
 	/*}
 #endif*/
@@ -336,10 +336,10 @@ bool TrayIconFreeDesktop::x11Event(XEvent *ev)
 	switch(ev->type)
 	{
 	case ReparentNotify:
-		setUpdatesEnabled(false);
+// 		setUpdatesEnabled(false);
 		show();
-		updateMask();
-		setUpdatesEnabled(true);
+// 		updateMask();
+// 		setUpdatesEnabled(true);
 	}
 	return false;
 }