diff --git a/graf2d/x11/src/GX11Gui.cxx b/graf2d/x11/src/GX11Gui.cxx
index 61fab06f1f8d1..3064768dfc5e4 100644
--- a/graf2d/x11/src/GX11Gui.cxx
+++ b/graf2d/x11/src/GX11Gui.cxx
@@ -1722,7 +1722,7 @@ void TGX11::ChangeProperty(Window_t id, Atom_t property, Atom_t type,
    if (!id) return;
 
    XChangeProperty((Display*)fDisplay, (Window) id, (Atom) property, (Atom) type,
-                   8, PropModeReplace, data, len);
+                   32, PropModeReplace, data, len);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/gui/ged/src/TGedPatternSelect.cxx b/gui/ged/src/TGedPatternSelect.cxx
index 7abc6c8da3bc5..a50997c4b650a 100644
--- a/gui/ged/src/TGedPatternSelect.cxx
+++ b/gui/ged/src/TGedPatternSelect.cxx
@@ -313,6 +313,10 @@ TGedPopup::TGedPopup(const TGWindow *p, const TGWindow *m, UInt_t w, UInt_t h,
    wattr.fSaveUnder = kTRUE;
    gVirtualX->ChangeWindowAttributes(fId, &wattr);
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_TOOLTIP", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    AddInput(kStructureNotifyMask);
 }
 
diff --git a/gui/gui/src/TGColorSelect.cxx b/gui/gui/src/TGColorSelect.cxx
index 9599c4fb562e8..aea65ebb4954f 100644
--- a/gui/gui/src/TGColorSelect.cxx
+++ b/gui/gui/src/TGColorSelect.cxx
@@ -228,6 +228,10 @@ TGColorPopup::TGColorPopup(const TGWindow *p, const TGWindow *m, Pixel_t color)
    //wattr.fSaveUnder = kTRUE;
    gVirtualX->ChangeWindowAttributes(fId, &wattr);
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_TOOLTIP", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    AddInput(kStructureNotifyMask);
 
    fActive = -1;
diff --git a/gui/gui/src/TGComboBox.cxx b/gui/gui/src/TGComboBox.cxx
index 35ccc3a09f735..4e85fffec3c32 100644
--- a/gui/gui/src/TGComboBox.cxx
+++ b/gui/gui/src/TGComboBox.cxx
@@ -75,6 +75,10 @@ TGComboBoxPopup::TGComboBoxPopup(const TGWindow *p, UInt_t w, UInt_t h,
    wattr.fBorderWidth = 1;
    gVirtualX->ChangeWindowAttributes(fId, &wattr);
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_COMBO", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    AddInput(kStructureNotifyMask);
    fEditDisabled = kEditDisable | kEditDisableGrab  | kEditDisableBtnEnable;
    SetWindowName();
diff --git a/gui/gui/src/TGMenu.cxx b/gui/gui/src/TGMenu.cxx
index b97a2a31e3834..be3bd07ec889a 100644
--- a/gui/gui/src/TGMenu.cxx
+++ b/gui/gui/src/TGMenu.cxx
@@ -962,6 +962,10 @@ TGPopupMenu::TGPopupMenu(const TGWindow *p, UInt_t w, UInt_t h, UInt_t options)
 
    gVirtualX->ChangeWindowAttributes(fId, &wattr);
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_POPUP_MENU", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    AddInput(kPointerMotionMask | kEnterWindowMask | kLeaveWindowMask);
 }
 
diff --git a/gui/gui/src/TGToolTip.cxx b/gui/gui/src/TGToolTip.cxx
index e967d2677eb0a..dc6afe44caf86 100644
--- a/gui/gui/src/TGToolTip.cxx
+++ b/gui/gui/src/TGToolTip.cxx
@@ -89,6 +89,10 @@ TGToolTip::TGToolTip(const TGWindow *p, const TGFrame *f, const char *text,
    gVirtualX->ChangeWindowAttributes(fId, &attr);
    SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_TOOLTIP", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    fLabel = new TGLabel(this, text);
    fLabel->SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
    fLabel->SetTextColor(fClient->GetResourcePool()->GetTipFgndColor());
@@ -124,6 +128,10 @@ TGToolTip::TGToolTip(const TGWindow *p, const TBox *box, const char *text,
    gVirtualX->ChangeWindowAttributes(fId, &attr);
    SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_TOOLTIP", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    fLabel = new TGLabel(this, text);
    fLabel->SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
    fLabel->SetTextColor(fClient->GetResourcePool()->GetTipFgndColor());
@@ -157,6 +165,10 @@ TGToolTip::TGToolTip(const TBox *box, const char *text,Long_t delayms)
    gVirtualX->ChangeWindowAttributes(fId, &attr);
    SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_TOOLTIP", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    fLabel = new TGLabel(this, text);
    fLabel->SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
    fLabel->SetTextColor(fClient->GetResourcePool()->GetTipFgndColor());
@@ -188,6 +200,10 @@ TGToolTip::TGToolTip(Int_t x, Int_t y, const char *text, Long_t delayms)
    gVirtualX->ChangeWindowAttributes(fId, &attr);
    SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
 
+   Atom_t property_type = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE", kFALSE);
+   Atom_t property_value = gVirtualX->InternAtom("_NET_WM_WINDOW_TYPE_TOOLTIP", kFALSE);
+   gVirtualX->ChangeProperty(fId, property_type, 4, (UChar_t*)&property_value, 1);
+
    fLabel = new TGLabel(this, text);
    fLabel->SetBackgroundColor(fClient->GetResourcePool()->GetTipBgndColor());
    fLabel->SetTextColor(fClient->GetResourcePool()->GetTipFgndColor());