diff --git a/extension.js b/extension.js
index 7d8e06d..5f81ae6 100644
--- a/extension.js
+++ b/extension.js
@@ -15,6 +15,8 @@ let statusArea;
 * We make a panel button for the top panel for it. */
 function _onTrayIconAdded(o, icon) {
     let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+    if (wmClass != "starcal2.py")
+        return;
 
     icon.height = Panel.PANEL_ICON_SIZE;
     let buttonBox = new PanelMenu.Button();
diff --git a/starcal.spec b/starcal.spec
index 5a7e179..0d8045a 100644
--- a/starcal.spec
+++ b/starcal.spec
@@ -2,7 +2,7 @@
 
 Name:           starcal
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A full-featured international calendar written in Python
 
 Group:          User Interface/Desktops
@@ -95,6 +95,9 @@ desktop-file-install     \
 %{_datadir}/gnome-shell/extensions/*
 
 %changelog
+* Mon Jan 28 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 2.1.0-4
+- Fix a bug in gnome 3.6 extension which brought everything to top bar
+
 * Sun Jan 27 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 2.1.0-3
 - Gnome 3.6 compatible extension created