diff --git a/css/main.css b/css/main.css
index cb81cd10b..818a1b026 100644
--- a/css/main.css
+++ b/css/main.css
@@ -307,3 +307,8 @@ form {
     text-align: center;
     cursor: pointer;
 }
+
+.glow
+{
+    text-shadow: 0px 0px 30px #06a5df, 0px 0px 10px #06a5df, 0px 0px 5px #06a5df,0px 0px 3px #06a5df;
+}
diff --git a/desktopsharing.js b/desktopsharing.js
index 8ef0ce477..1b2f0fcba 100644
--- a/desktopsharing.js
+++ b/desktopsharing.js
@@ -247,6 +247,7 @@ function streamSwitchDone() {
     //window.setTimeout(
     //    function () {
     switchInProgress = false;
+    Toolbar.changeDesktopSharingButtonState(isUsingScreenStream);
     //    }, 100
     //);
 }
diff --git a/toolbar.js b/toolbar.js
index fdd0970dc..f7130d074 100644
--- a/toolbar.js
+++ b/toolbar.js
@@ -238,5 +238,21 @@ var Toolbar = (function (my) {
         }
     };
 
+    /**
+     * Sets the state of the button. The button has blue glow if desktop streaming is active.
+     * @param active the state of the desktop streaming.
+     */
+    my.changeDesktopSharingButtonState = function (active) {
+        var button = $("#desktopsharing > a");
+        if(active)
+        {
+            button.addClass("glow");
+        }
+        else
+        {
+            button.removeClass("glow");
+        }
+    }
+
     return my;
 }(Toolbar || {}));