diff --git a/CHANGES/1595.bugfix.rst b/CHANGES/1595.bugfix.rst
new file mode 100644
index 00000000..f56d8b2a
--- /dev/null
+++ b/CHANGES/1595.bugfix.rst
@@ -0,0 +1 @@
+Fixed endless loop while adding buttons to the :code:`KeyboardBuilder`.