diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index 9c2b03dd1..c92a9e891 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -259,7 +259,7 @@ public static void enableLocalVideo(Call call, boolean enable)
         {
             // First disable desktop sharing if it's currently enabled.
             if (enable && isDesktopSharingEnabled(call))
-                enableDesktopSharing(call, false);
+                getActiveCallContainer(call).setDesktopSharingButtonSelected(false);
 
             try
             {
@@ -556,7 +556,7 @@ private static void enableDesktopSharing(Call call,
             // First make sure to disable the local video if it's currently
             // enabled.
             if (enable && isLocalVideoEnabled(call))
-                enableLocalVideo(call, false);
+                getActiveCallContainer(call).setVideoButtonSelected(false);
 
             try
             {