diff --git a/CHANGELOG.md b/CHANGELOG.md
index 787ae41d6..0755e19f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 0.12.1 (Unreleased)
 
+BUG FIXES:
+
+core: Always try to select a workspace after initialization (#21234)
+
 ## 0.12.0 (May 22, 2019)
 
 ---