diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48dc4f1d..fe9d3674 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 #### Fixed
 
-* *Nothing*
+* [#295](https://github.com/shlinkio/shlink-web-client/issues/295) Fixed custom slug field not being disabled when selecting a short code length.
 
 
 ## 2.5.1 - 2020-06-06
diff --git a/src/short-urls/CreateShortUrl.tsx b/src/short-urls/CreateShortUrl.tsx
index 93f8ee0f..82780fd3 100644
--- a/src/short-urls/CreateShortUrl.tsx
+++ b/src/short-urls/CreateShortUrl.tsx
@@ -108,7 +108,9 @@ const CreateShortUrl = (
 
         <div className="row">
           <div className="col-sm-4">
-            {renderOptionalInput('customSlug', 'Custom slug')}
+            {renderOptionalInput('customSlug', 'Custom slug', 'text', {
+              disabled: hasValue(shortUrlCreation.shortCodeLength),
+            })}
           </div>
           <div className="col-sm-4">
             {renderOptionalInput('shortCodeLength', 'Short code length', 'number', {