diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index b42e31e3a..82cd37764 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -15,6 +15,7 @@
 - #589 Save scroll position on minimize and restore it on maximize [rlanvin]
 - #592 Add random resource for `auto_login`, add method generateResource to generate random resource [davec82]
 - #598 Add option `synchronize_availability` [davec82]
+- #600 Fix change xmpp status also on icon-status click [davec82]
 
 ## 0.10.1 (2016-02-06)
 
diff --git a/src/converse-core.js b/src/converse-core.js
index c32deb572..65498bac9 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -3861,7 +3861,7 @@
 
             setStatus: function (ev) {
                 ev.preventDefault();
-                var $el = $(ev.target),
+                var $el = $(ev.currentTarget),
                     value = $el.attr('data-value');
                 if (value === 'logout') {
                     this.$el.find(".dropdown dd ul").hide();