diff --git a/ChangeLog.md b/ChangeLog.md
index 869c101db5a..afb4dc5a7d0 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -9,6 +9,7 @@
 
 ###### Issues fixed
 - [`KT-14693`](https://youtrack.jetbrains.com/issue/KT-14693) Introduce Type Alias: Do not suggest type qualifiers
+- [`KT-14696`](https://youtrack.jetbrains.com/issue/KT-14696) Introduce Type Alias: Fix NPE during dialog repaint
 
 ## 1.1-M03 (EAP-3)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java
index d3cb2fb288b..7c501974289 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java
@@ -137,7 +137,7 @@ public class KotlinIntroduceTypeAliasDialog extends DialogWrapper {
                             boolean isSelected,
                             boolean cellHasFocus
                     ) {
-                        String tokenValue = ((KtModifierKeywordToken) value).getValue();
+                        String tokenValue = value != null ? ((KtModifierKeywordToken) value).getValue() : null;
                         return super.getListCellRendererComponent(list, tokenValue, index, isSelected, cellHasFocus);
                     }
                 }