diff --git a/horilla_widgets/templates/horilla_widgets/attr.html b/horilla_widgets/templates/horilla_widgets/attr.html
index 7a5592afc..c52de9eea 100644
--- a/horilla_widgets/templates/horilla_widgets/attr.html
+++ b/horilla_widgets/templates/horilla_widgets/attr.html
@@ -1 +1 @@
-{% for name, value in widget.attrs.items %}{% if value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %}
\ No newline at end of file
+{% for name, value in widget.attrs.items %}{% if value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %}
diff --git a/horilla_widgets/templates/horilla_widgets/select_option.html b/horilla_widgets/templates/horilla_widgets/select_option.html
index e9349756c..1863b118a 100644
--- a/horilla_widgets/templates/horilla_widgets/select_option.html
+++ b/horilla_widgets/templates/horilla_widgets/select_option.html
@@ -1 +1 @@
-<option value="{{ widget.value|stringformat:'s' }}" {% include "horilla_widgets/attr.html" %} {% if not widget.value %}disabled{% endif %}>{{ widget.label }}{{widget.disable_option}}</option>
+<option value="{{ widget.value|stringformat:'s' }}" {% include "horilla_widgets/attr.html" %} {% if widget.value == "" %}disabled{% endif %}>{{ widget.label }}{{widget.disable_option}}</option>