diff --git a/panels_ipe/css/panels_ipe.css b/panels_ipe/css/panels_ipe.css
index ec372c6..d744e92 100644
--- a/panels_ipe/css/panels_ipe.css
+++ b/panels_ipe/css/panels_ipe.css
@@ -428,6 +428,11 @@ div.panels-ipe-control input.panels-ipe-cancel {
   );
 }
 
+#panels-ipe-preview {
+  background-image: url(../images/icon_preview.png),-webkit-gradient(linear,left bottom,left top,color-stop(0,#383838),color-stop(1,#666));
+  background-repeat: no-repeat;
+}
+
 div.panels-ipe-pseudobutton-container:hover,
 div.panels-ipe-control .form-submit:hover {
   background: #999999;
diff --git a/panels_ipe/js/panels_ipe.js b/panels_ipe/js/panels_ipe.js
index aad076d..0160b90 100644
--- a/panels_ipe/js/panels_ipe.js
+++ b/panels_ipe/js/panels_ipe.js
@@ -428,6 +428,23 @@ $(function() {
       }
     }
 
+    // Enable Preview buttom in container control
+    if ($(this.element).attr('id') == 'panels-ipe-preview') {
+      if($(this.element).hasClass( "panels-ipe-preview")) {
+        $('.panels-ipe-placeholder, .panels-ipe-handlebar-wrapper').hide();
+        $('.panels-ipe-editing').removeClass('panels-ipe-editing').addClass('panels-ipe-previewing');
+        $(this.element).removeClass('panels-ipe-preview').addClass('panels-ipe-preview-off');
+        $(this.element).attr('value', 'Preview off');
+      } else {
+        $('.panels-ipe-placeholder, .panels-ipe-handlebar-wrapper').show();
+        $('.panels-ipe-editing').removeClass('panels-ipe-previewing').addClass('panels-ipe-editing');
+        $(this.element).removeClass('panels-ipe-preview-off').addClass('panels-ipe-preview');
+        $(this.element).attr('value', 'Preview');
+        Drupal.PanelsIPE.editors[this.element_settings.ipe_cache_key].initEditing();
+      }
+      return false;
+    }
+
     var retval = this.ipeReplacedEventResponse(element, event);
     if (this.ajaxing && this.element_settings.ipe_cache_key) {
       // Move the throbber so that it appears outside our container.
diff --git a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
index f1b32c5..ffd1733 100644
--- a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -462,5 +462,15 @@ function panels_ipe_edit_control_form($form, &$form_state) {
     '#attributes' => array('class' => array('panels-ipe-cancel')),
     '#value' => t('Cancel'),
   );
+  $form['buttons']['preview'] = array(
+    '#type' => 'button',
+    '#id' => 'panels-ipe-preview',
+    '#attributes' => array(
+      'class' => array(
+        '0' => 'panels-ipe-preview',
+        ),
+      ),
+    '#value' => 'Preview',
+  );
   return $form;
 }