         labelEditor().container.show()
         labelEditor().container.offset(currentLabel.offset())
         labelEditor().textfield.outerWidth(currentLabel.outerWidth() - labelEditor().checkbox.outerWidth(true))
-        labelEditor().textfield.val(currentLabel.html()).focus()
+        labelEditor().textfield.val(labelValue()).focus()
         labelEditor().checkbox.prop('checked', isLabelHtml())
 
     $('.fb-main').on('click', '.xforms-label', startEdit)

    currentLabel = null
    isLabelHtml = -> currentControl.is('.fb-label-is-html')
    setLabelHtml = (isHtml) -> currentControl.toggleClass('.fb-label-is-html', isHtml)

    # Called when users press enter or tab out
    endEdit = ->

            labelEditor().checkbox.tooltip('destroy')
            labelEditor().container.hide()
            # Update values in the DOM, without waiting for the server to send us the value
            setLabelHtml(isChecked)
            labelValue(newLabel)

    # Heuristic to close the editor based on click and focus events
    clickOrFocus = ({target}) ->
