diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
index 94b4f323a..016224165 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
@@ -34,6 +34,11 @@ public class CallDialog
                CallChangeListener,
                CallPeerConferenceListener
 {
+    /**
+     * The logger.
+     */
+    private final Logger logger = Logger.getLogger(CallDialog.class);
+
     /**
      * The dial button name.
      */
@@ -797,6 +802,13 @@ private void updateCurrentCallPanel(JComponent callPanel)
         }
         else
         {
+            // First disable video.
+            if (videoButton.isSelected())
+                videoButton.setSelected(false);
+
+            if (fullScreenButton.isSelected())
+                fullScreenButton.setSelected(false);
+
             settingsPanel.remove(videoButton);
             settingsPanel.remove(transferCallButton);
             settingsPanel.remove(fullScreenButton);