diff --git a/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e b/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e
index ee0d51cd..5dcbb5f5 100644
--- a/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e
+++ b/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e
@@ -55,6 +55,11 @@ feature -- Change
 		do
 			if active /= a then
 				active := a
+				if a then
+					add_class ("active")
+				else
+					remove_class ("active")
+				end
 				state_changes.replace (create {JSON_BOOLEAN}.make_boolean (a), "active")
 			end
 		end
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
index ab70a7de..9294e329 100644
--- a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
+++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_stateless_control.e
@@ -75,7 +75,7 @@ feature -- Rendering
 				l_attributes.append_character ('%"')
 			end
 			Result := "<" + tag + " " + l_attributes
-			if body.is_empty and not tag.same_string ("textarea") and not tag.same_string ("span") and not tag.same_string ("button") and not tag.same_string ("ul") then
+			if body.is_empty and not tag.same_string ("textarea") and not tag.same_string ("span") and not tag.same_string ("button") and not tag.same_string ("ul") and not tag.same_string ("div") then
 				Result.append (" />")
 			else
 				Result.append (" >" + body + "</" + tag + ">")