diff --git a/templates/library/common/common.mako b/templates/library/common/common.mako
index 1f0eec64fde..e0cc71adb3c 100644
--- a/templates/library/common/common.mako
+++ b/templates/library/common/common.mako
@@ -7,21 +7,21 @@
         if isinstance( field[ 'widget' ], TextArea ) and field[ 'widget' ].value:
             has_contents = True
             label = field[ 'label' ]
-            value = '<pre>%s</pre>' % field[ 'widget' ].value
+            widget = field[ 'widget' ]
         elif isinstance( field[ 'widget' ], TextField ) and field[ 'widget' ].value:
             has_contents = True
             label = field[ 'label' ]
-            value = field[ 'widget' ].value
+            widget = field[ 'widget' ]
         elif isinstance( field[ 'widget' ], SelectField ) and field[ 'widget' ].options:
             for option_label, option_value, selected in field['widget'].options:
                 if selected:
                     has_contents = True
                     label = field[ 'label' ]
-                    value = option_value
+                    widget = field[ 'widget' ]
         elif isinstance( field[ 'widget' ], CheckboxField ) and field[ 'widget' ].checked:
             has_contents = True
             label = field[ 'label' ]
-            value = 'checked'
+            widget = field[ 'widget' ]
         elif isinstance( field[ 'widget' ], WorkflowField ) and str( field[ 'widget' ].value ).lower() not in [ 'none' ]:
             has_contents = True
             label = field[ 'label' ]
@@ -40,12 +40,11 @@
             widget = field[ 'widget' ]
             address = trans.sa_session.query( trans.model.UserAddress ).get( int( widget.value ) )
             label = address.desc
-            value = address.get_html()
     %>
     %if has_contents:
         <div class="form-row">
             <label>${label}</label>
-            ${value}
+            ${widget.get_html( disabled=True )}
             <div class="toolParamHelp" style="clear: both;">
                 ${field[ 'helptext' ]}
             </div>