diff --git a/css/panopoly-modal.css b/css/panopoly-modal.css
index 4b2d87d..6eebae9 100644
--- a/css/panopoly-modal.css
+++ b/css/panopoly-modal.css
@@ -319,20 +319,20 @@
   text-align: right;
 }
 
-#modal-content .widget-preview-title {
+#modal-content .panopoly-magic-preview-title {
   position: absolute;
   right: -1px;
   top: -24px;
   font: bold 11px/23px 'Open Sans', 'Lucida Sans', 'Lucida Grande', Verdana, sans-serif;
 }
 
-#modalContent .widget-preview-title .content-type-button span {
+#modalContent .panopoly-magic-preview-title .content-type-button span {
   width: auto;
   padding: 0 0 0 5px;
   top: 0;
 }
 
-#modal-content .widget-preview-title .content-type-button a {
+#modal-content .panopoly-magic-preview-title .content-type-button a {
   display: inline-block;
   font: bold 11px/23px 'Open Sans', 'Lucida Sans', 'Lucida Grande',  Verdana, sans-serif;
   color: #fff;
@@ -360,8 +360,8 @@
   width: 60px;
 }
 
-#modal-content .widget-preview-title .content-type-button a:hover,
-#modal-content .widget-preview-title .content-type-button a:focus {
+#modal-content .panopoly-magic-preview-title .content-type-button a:hover,
+#modal-content .panopoly-magic-preview-title .content-type-button a:focus {
   background: #56CE00;
   background-image: linear-gradient(bottom, #408E00 0%, #56CE00 100%);
   background-image: -o-linear-gradient(bottom, #408E00 0%, #56CE00 100%);
@@ -377,7 +377,7 @@
   );
 }
 
-#modal-content .widget-preview-title .content-type-button a:active {
+#modal-content .panopoly-magic-preview-title .content-type-button a:active {
   background: #5DE000;
   background-image: linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
   background-image: -o-linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
@@ -441,7 +441,7 @@
   font-size: 1em;
 }
 
-#modal-content .widget-preview-title .content-type-button img, 
+#modal-content .panopoly-magic-preview-title .content-type-button img, 
 #modal-content .panels-add-content-modal > .panels-modal-add-category {
   display: none;
 }
@@ -557,19 +557,19 @@
   box-shadow: 0 0 0 0 #fff;
 }
 
-#modal-content .content-wrapper {
+#modal-content .panopoly-magic-preview-link {
   position: relative;
   padding: 5px 0px;
 }
 
-#modal-content .content-wrapper .content-type-button {
+#modal-content .panopoly-magic-preview-link .content-type-button {
   position: absolute;
   right: 10px;
   top: 50%;
   margin-top: -10px;
 }
 
-#modal-content .content-wrapper .content-type-button a {
+#modal-content .panopoly-magic-preview-link .content-type-button a {
   background: #999;
   float: left;
   color: white;
@@ -577,23 +577,23 @@
   opacity: 0;
 }
 
-#modal-content .content-wrapper .content-type-button a img {
+#modal-content .panopoly-magic-preview-link .content-type-button a img {
   display: none;
 }
 
-#modal-content .content-wrapper .content-type-button a span {
+#modal-content .panopoly-magic-preview-link .content-type-button a span {
   margin: 0;
   padding: 0;
   left: 0;
   top: 0;
 }
 
-#modal-content .content-wrapper .content-type-button a:hover,
-#modal-content .content-wrapper .content-type-button a:focus {
+#modal-content .panopoly-magic-preview-link .content-type-button a:hover,
+#modal-content .panopoly-magic-preview-link .content-type-button a:focus {
   background: #2fa6e5;
 }
 
-#modal-content .content-wrapper > a {
+#modal-content .panopoly-magic-preview-link > a {
   background: transparent;
   border: none;
   color: #666;
@@ -604,17 +604,17 @@
   cursor: pointer;
 }
 
-#modal-content .content-wrapper > a:hover,
-#modal-content .content-wrapper > a:focus {
+#modal-content .panopoly-magic-preview-link > a:hover,
+#modal-content .panopoly-magic-preview-link > a:focus {
   color: #000;
 }
 
-#modal-content .content-wrapper:hover {
+#modal-content .panopoly-magic-preview-link:hover {
   background-color: #f1f1f1;
 }
 
-#modal-content .content-wrapper:hover .content-type-button a,
-#modal-content .content-wrapper > a:focus + .content-type-button a,
-#modal-content .content-wrapper .content-type-button a:focus {
+#modal-content .panopoly-magic-preview-link:hover .content-type-button a,
+#modal-content .panopoly-magic-preview-link > a:focus + .content-type-button a,
+#modal-content .panopoly-magic-preview-link .content-type-button a:focus {
   opacity: 1;
 }
diff --git a/panopoly-magic-preview.tpl.php b/panopoly-magic-preview.tpl.php
index 88c3a54..cacd5f0 100644
--- a/panopoly-magic-preview.tpl.php
+++ b/panopoly-magic-preview.tpl.php
@@ -7,8 +7,7 @@
 <fieldset <?php print $attributes; ?>>
   <legend>
     <?php if (!empty($add_link)): ?>
-    <?php // @todo Re-evaluate the name of this class! ?>
-      <div class="widget-preview-title"><?php print $add_link; ?></div>
+      <div class="panopoly-magic-preview-title"><?php print $add_link; ?></div>
     <?php endif; ?>
     <span class="fieldset-legend"><?php print $title; ?></span>
   </legend>
diff --git a/panopoly-magic.js b/panopoly-magic.js
index 9fe5ef8..8aec248 100644
--- a/panopoly-magic.js
+++ b/panopoly-magic.js
@@ -20,7 +20,7 @@
         // will move the focus to the first widget by default.
         setTimeout(function () {
           var link_class = 'add-content-link-' + settings.panopoly_magic.pane_add_preview_subtype.replace(/_/g, '-') + '-icon-text-button';
-          $('#modal-content .content-wrapper .content-type-button a.' + link_class, context).focus();
+          $('#modal-content .panopoly-magic-preview-link .content-type-button a.' + link_class, context).focus();
         }, 0);
       }
     }
diff --git a/panopoly_magic.module b/panopoly_magic.module
index 96f2c16..aed0eaf 100644
--- a/panopoly_magic.module
+++ b/panopoly_magic.module
@@ -1518,8 +1518,7 @@ function _panopoly_magic_render_add_content_link($vars, $content_type, $title) {
  */
 function theme_panopoly_magic_preview_link($vars) {
   $html = '';
-  // @todo Re-evaluate the name of this class!
-  $html .= '<div class="content-wrapper">';
+  $html .= '<div class="panopoly-magic-preview-link clearfix">';
   $html .= $vars['preview_link'];
   $html .= $vars['add_link'];
   $html .= '</div>';