diff --git a/ChangeLog.md b/ChangeLog.md
index e95959f2..164f2b8f 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,9 @@
 # Changelog:
+* **22.01.21**
+    - Allowing the user to easily change the channel name mode
+    - Fixed channel name mode parsing
+    - Improved the modal algorithms as preparation for easier popoutable modals
+  
 * **16.01.21**
     - Various bugfixes (Thanks to Vafin)
     
diff --git a/shared/js/ui/modal/channel-edit/Renderer.tsx b/shared/js/ui/modal/channel-edit/Renderer.tsx
index 716bd0a6..761316d1 100644
--- a/shared/js/ui/modal/channel-edit/Renderer.tsx
+++ b/shared/js/ui/modal/channel-edit/Renderer.tsx
@@ -180,6 +180,7 @@ const ChannelName = React.memo(() => {
                 type={"boxed"}
                 title={useTr("Channel name mode")}
                 refSelect={refSelect}
+                disabled={!editable}
             >
                 <option value={"loading"} style={{ display: "none" }}>{useTr("loading")}</option>
                 <option value={"normal"}>{useTr("Normal Name")}</option>