diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
index 3ac2e10a4..01e6508b9 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
@@ -688,6 +688,19 @@ private Component createEncodingControls(int type,
         final JTable table = new JTable();
         table.setShowGrid(false);
         table.setTableHeader(null);
+        table.setDefaultRenderer(Object.class, new DefaultTableCellRenderer()
+        {
+            @Override
+            public Component getTableCellRendererComponent(JTable rtable,
+                Object value, boolean isSelected, boolean hasFocus, int row,
+                int column)
+            {
+                Component component = super.getTableCellRendererComponent(
+                    rtable, value, isSelected, hasFocus, row, column);
+                component.setEnabled(rtable != null && rtable.isEnabled());
+                return component;
+            }
+        });
 
         key = "impl.media.configform.UP";
         final JButton upButton = new JButton(resources.getI18NString(key));
@@ -706,13 +719,6 @@ private Component createEncodingControls(int type,
         Container parentButtonBar = new TransparentPanel(new BorderLayout());
         parentButtonBar.add(buttonBar, BorderLayout.NORTH);
 
-        Container container = new TransparentPanel(new BorderLayout());
-        container.setPreferredSize(new Dimension(WIDTH, 100));
-        container.setMaximumSize(new Dimension(WIDTH, 100));
-
-        container.add(new JScrollPane(table), BorderLayout.CENTER);
-        container.add(parentButtonBar, BorderLayout.EAST);
-
         table.setModel(new EncodingConfigurationTableModel(type,
                 encodingConfiguration));
         /*
@@ -724,7 +730,7 @@ private Component createEncodingControls(int type,
         TableColumn tableColumn = tableColumnModel.getColumn(0);
         tableColumn.setMaxWidth(tableColumn.getMinWidth());
 
-        ListSelectionListener tableSelectionListener =
+        final ListSelectionListener tableSelectionListener =
             new ListSelectionListener()
             {
                 public void valueChanged(ListSelectionEvent event)
@@ -767,6 +773,29 @@ else if (source == downButton)
         upButton.addActionListener(buttonListener);
         downButton.addActionListener(buttonListener);
 
+        Container container = new TransparentPanel(new BorderLayout())
+        {
+            @Override
+            public void setEnabled(boolean enabled)
+            {
+                super.setEnabled(enabled);
+                table.setEnabled(enabled);
+                if (enabled)
+                {
+                    tableSelectionListener.valueChanged(null);
+                }
+                else
+                {
+                    upButton.setEnabled(false);
+                    downButton.setEnabled(false);
+                }
+            }
+        };
+        container.setPreferredSize(new Dimension(WIDTH, 100));
+        container.setMaximumSize(new Dimension(WIDTH, 100));
+
+        container.add(new JScrollPane(table), BorderLayout.CENTER);
+        container.add(parentButtonBar, BorderLayout.EAST);
         return container;
     }
 
diff --git a/src/net/java/sip/communicator/util/plugin/wizard/EncodingsPanel.java b/src/net/java/sip/communicator/util/plugin/wizard/EncodingsPanel.java
index 52e01177e..b11831ac0 100644
--- a/src/net/java/sip/communicator/util/plugin/wizard/EncodingsPanel.java
+++ b/src/net/java/sip/communicator/util/plugin/wizard/EncodingsPanel.java
@@ -10,6 +10,8 @@
 import java.awt.event.*;
 import java.util.*;
 import javax.swing.*;
+import javax.swing.event.*;
+
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
@@ -96,7 +98,14 @@ public EncodingsPanel()
         overrideCheckBox = new SIPCommCheckBox(resourceService.
             getI18NString("plugin.jabberaccregwizz.OVERRIDE_ENCODINGS"),
                 false);
-    
+        overrideCheckBox.addChangeListener(new ChangeListener()
+        {
+            public void stateChanged(ChangeEvent e)
+            {
+                updateTableState();
+            }
+        });
+
         mediaConfiguration 
                 = UtilActivator.getMediaConfiguration();
 
@@ -204,5 +213,15 @@ private void resetTables()
 
         audioPanel.add(audioControls);
         videoPanel.add(videoControls);
+        updateTableState();
+    }
+
+    /**
+     * Enables or disables the encodings tables based on the override checkbox.
+     */
+    private void updateTableState()
+    {
+        audioControls.setEnabled(overrideCheckBox.isSelected());
+        videoControls.setEnabled(overrideCheckBox.isSelected());
     }
 }