diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 2dd6e3f9a6..b052790cc9 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -862,3 +862,7 @@
 	* Support item separators in D-Bus menu
 	* Support freedesktop icons in D-Bus menu
 	* Reduce D-Bus communication (omit default values)
+
+2012-12-29  Mike Blumenkrantz
+
+        * Tooltips now correctly set NETWM tooltip window type
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 61875b70ef..61533badff 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -106,6 +106,7 @@ Fixes:
    * Fix typo from elm_plug signal "image.deleted", should be "image,deleted".
    * Fix photocam returns file set error correctly.
    * Fix bug where genlist would delete items added during selection callback if a clear was queued
+   * Tooltips now correctly set NETWM tooltip window type
 
 Removals:
 
diff --git a/legacy/elementary/src/lib/els_tooltip.c b/legacy/elementary/src/lib/els_tooltip.c
index 4d8b74397d..2e86a2589a 100644
--- a/legacy/elementary/src/lib/els_tooltip.c
+++ b/legacy/elementary/src/lib/els_tooltip.c
@@ -131,7 +131,7 @@ _elm_tooltip_show(Elm_Tooltip *tt)
      }
    if (tt->free_size)
      {
-        tt->tt_win = elm_win_add(NULL, "tooltip", ELM_WIN_BASIC);
+        tt->tt_win = elm_win_add(NULL, "tooltip", ELM_WIN_TOOLTIP);
         elm_win_override_set(tt->tt_win, EINA_TRUE);
         tt->tt_evas = evas_object_evas_get(tt->tt_win);
         tt->tooltip = edje_object_add(tt->tt_evas);