diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4984955..9b60097 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 0.0.52
 
+* Improve work with UIKitModifiers
+
 ## 0.0.51
 
 * New interface `Dropdown` which will be used to create (or retrieve) dropdown for an element
diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitModifier.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitModifier.kt
index bfffeb6..d202890 100644
--- a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitModifier.kt
+++ b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitModifier.kt
@@ -26,8 +26,8 @@ operator fun UIKitModifier.plus(other: UIKitModifier): UIKitModifier = UIKitCust
     classes + other.classes,
     otherAttrs + other.otherAttrs
 )
-fun <T: Element> UIKitModifier.builder() = Attrs<T>(this).builder
-fun <T: Element> Array<out UIKitModifier>.builder() = Attrs<T>(*this).builder
-inline fun <T: Element> attrsBuilder(vararg modifiers: UIKitModifier) = modifiers.builder<T>()
+fun <T: Element> UIKitModifier?.builder() = Attrs<T>(this).builder
+fun <T: Element> Array<out UIKitModifier?>.builder() = Attrs<T>(*this).builder
+inline fun <T: Element> attrsBuilder(vararg modifiers: UIKitModifier?) = modifiers.builder<T>()
 @JsName("plusBuilder")
-operator fun <T: Element> UIKitModifier.plus(other: UIKitModifier): AttrBuilderContext<T> = Attrs<T>(this@plus, other).builder
+operator fun <T: Element> UIKitModifier?.plus(other: UIKitModifier?): AttrBuilderContext<T> = Attrs<T>(this@plus, other).builder