diff --git a/src/main/java/io/github/dsheirer/controller/channel/NameConfigurationEditor.java b/src/main/java/io/github/dsheirer/controller/channel/NameConfigurationEditor.java
index 94e0090d..6699e177 100644
--- a/src/main/java/io/github/dsheirer/controller/channel/NameConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/controller/channel/NameConfigurationEditor.java
@@ -300,6 +300,19 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
             {
                 mAliasListCombo.setSelectedItem(channel.getAliasListName());
             }
+
+            if(channel.isAutoStart())
+            {
+                mAutoStartCheckBox.setSelected(channel.isAutoStart());
+                mAutoStartOrder.setEnabled(true);
+            }
+            else
+            {
+                mAutoStartCheckBox.setSelected(false);
+                mAutoStartOrder.setEnabled(false);
+            }
+
+            mAutoStartOrder.setValue(channel.hasAutoStartOrder() ? channel.getAutoStartOrder() : 0);
         }
         else
         {
@@ -307,18 +320,6 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
             mChannelName.setText(null);
         }
 
-        if(channel.isAutoStart())
-        {
-            mAutoStartCheckBox.setSelected(channel.isAutoStart());
-            mAutoStartOrder.setEnabled(true);
-        }
-        else
-        {
-            mAutoStartCheckBox.setSelected(false);
-            mAutoStartOrder.setEnabled(false);
-        }
-
-        mAutoStartOrder.setValue(channel.hasAutoStartOrder() ? channel.getAutoStartOrder() : 0);
 
         setModified(false);
     }