diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java b/ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java
index 453d4be6c..20ec17846 100644
--- a/ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java
+++ b/ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java
@@ -49,18 +49,18 @@ public ChannelModesPane(final Channel channel, final IconManager iconManager) {
 
     @Override
     public boolean hasModeValue(final String mode) {
-        return channel.getConfigManager().hasOptionString("server", "mode" + mode);
+        return channel.getWindowModel().getConfigManager().hasOptionString("server", "mode" + mode);
     }
 
     @Override
     public String getModeValue(final String mode) {
-        return channel.getConfigManager().getOption("server", "mode" + mode);
+        return channel.getWindowModel().getConfigManager().getOption("server", "mode" + mode);
     }
 
     @Override
     public boolean isModeEnabled(final String mode) {
-        return !channel.getConfigManager().hasOptionString("server",
-                "enablemode" + mode) || channel.getConfigManager()
+        return !channel.getWindowModel().getConfigManager().hasOptionString("server",
+                "enablemode" + mode) || channel.getWindowModel().getConfigManager()
                 .getOptionBool("server", "enablemode" + mode);
     }
 
diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java b/ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
index 83b9ca196..51037806f 100644
--- a/ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
+++ b/ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
@@ -171,7 +171,7 @@ private void initComponents(final TabCompleterUtils tabCompleterUtils) {
 
         initSettingsTab();
 
-        tabbedPane.setSelectedIndex(channel.getConfigManager().
+        tabbedPane.setSelectedIndex(channel.getWindowModel().getConfigManager().
                 getOptionInt("dialogstate", "channelsettingsdialog"));
     }
 
@@ -198,8 +198,8 @@ private void initIrcTab() {
 
     /** Initialises the IRC Settings tab. */
     private void initListModesTab() {
-        channelListModesPane = new ChannelListModesPane(channel.getConfigManager(), userConfig,
-                iconManager, channel, this);
+        channelListModesPane = new ChannelListModesPane(channel.getWindowModel().getConfigManager(),
+                userConfig, iconManager, channel, this);
         tabbedPane.addTab("List Modes", channelListModesPane);
     }
 
@@ -216,7 +216,7 @@ private void initSettingsPanel() {
                 "These settings are specific to this channel on this network,"
                 + " any settings specified here will overwrite global settings");
         channelSettingsPane.addOption(preferencesManager.getChannelSettings(
-                channel.getConfigManager(), identity));
+                channel.getWindowModel().getConfigManager(), identity));
     }
 
     /** Initialises listeners for this dialog. */