diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 05566899b50aa4eb843865a2e56e43a4fec56eae..b7e9288667ba495a4dc807d6458a7c4b740e3e5f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-x.x, xxxx-xx-xx
 ---------------------------
+#348986 by sun: Added CSS class for toggle link container.
 #342864 by davexoxide, sun: Added YUI editor support.
 #343217 by sun: Fixed improperly capitalized library script name for nicEdit.
 #341267 by sun: Fixed improper test for internal editor plugins.
diff --git a/wysiwyg.js b/wysiwyg.js
index eea31ee12cf522e209d9defb55fb679192d7dc38..a29e9ac00ecd13028b63da45b3ae1ce4e0481a0e 100644
--- a/wysiwyg.js
+++ b/wysiwyg.js
@@ -115,7 +115,7 @@ Drupal.wysiwygAttachToggleLink = function(context, params) {
     var a = document.createElement('a');
     $(a).attr({id: 'wysiwyg-toggle-' + params.field, href: 'javascript:void(0);'}).append(text);
     var div = document.createElement('div');
-    $(div).append(a);
+    $(div).addClass('wysiwyg-toggle-wrapper').append(a);
     $('#' + params.field).after(div);
   }
   $('#wysiwyg-toggle-' + params.field).html(params.status ? Drupal.settings.wysiwyg.disable : Drupal.settings.wysiwyg.enable).show().unbind('click').click(function() {