diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index c6024f9831..39eb369831 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1450,6 +1450,7 @@ error_export_all=Please correct the export errors below then click OK.
 error_save_search=Failed to save search due to error: {0}
 error_restore_search=Failed to restore saved search due to error: {0}
 error_shortcut_permissions=Unable to navigate to the item as it cannot be read by this user. Another user may have modified the permission.
+error_association=Failed to find association definition for association \"{0}\".
 
 # Confirmations
 return_to_application=Return to application
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
index a8a4c73139..2d05f304f8 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
@@ -99,6 +99,30 @@ public class UIOpenSearch extends SelfRenderingComponent
       out.write("</script>\n");
       
       // write out the HTML
+      String styleClass = (String)this.getAttributes().get("styleClass");
+      String style = (String)this.getAttributes().get("style");
+      
+      if (styleClass != null || style != null)
+      {
+         out.write("<div");
+         
+         if (styleClass != null && styleClass.length() > 0)
+         {
+            out.write(" class='");
+            out.write(styleClass);
+            out.write("'");
+         }
+         
+         if (style != null && style.length() > 0)
+         {
+            out.write(" style='");
+            out.write(style);
+            out.write("'");
+         }
+         
+         out.write(">\n");
+      }
+      
       out.write("<div class='osPanel'><div class='osControls'>");
       out.write("<table border='0' cellpadding='2' cellspacing='0'><tr>");
       out.write("<td><input id='");
@@ -160,6 +184,11 @@ public class UIOpenSearch extends SelfRenderingComponent
       out.write("<div id='");
       out.write(clientId);
       out.write("-os-results'></div>\n</div>\n");
+      
+      if (styleClass != null || style != null)
+      {
+         out.write("</div>\n");
+      }
    }
    
    /**
diff --git a/source/web/WEB-INF/repo.tld b/source/web/WEB-INF/repo.tld
index 7efba8c526..49f3b28145 100644
--- a/source/web/WEB-INF/repo.tld
+++ b/source/web/WEB-INF/repo.tld
@@ -1624,6 +1624,18 @@
       
       <attribute>
          <name>id</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>style</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>styleClass</name>
          <required>false</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
diff --git a/source/web/jsp/sidebar/opensearch.jsp b/source/web/jsp/sidebar/opensearch.jsp
index de7196e82b..db4a9aab86 100644
--- a/source/web/jsp/sidebar/opensearch.jsp
+++ b/source/web/jsp/sidebar/opensearch.jsp
@@ -19,8 +19,4 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<f:verbatim><div class="osSidebarPanel"></f:verbatim>
-
-<r:openSearch id="sidebarOsClient" />
-
-<f:verbatim></div></f:verbatim>
\ No newline at end of file
+<r:openSearch id="sidebarOsClient" styleClass="osSidebarPanel" />
\ No newline at end of file