diff --git a/dist/angular-form-builder.css b/dist/angular-form-builder.css
index e48cf6c..07e7676 100644
--- a/dist/angular-form-builder.css
+++ b/dist/angular-form-builder.css
@@ -1 +1 @@
-.fb-component{padding:10px;cursor:move}.fb-component input{cursor:move}.fb-component label{cursor:move}.fb-component select{cursor:move}.fb-component textarea{cursor:move}.fb-form-object-editable{padding:10px}.fb-form-object-editable.fb-draggable{cursor:move}.fb-form-object-editable.fb-draggable input{cursor:move}.fb-form-object-editable.fb-draggable label{cursor:pointer}.fb-form-object-editable.fb-draggable select{cursor:move}.fb-form-object-editable.fb-draggable textarea{cursor:move}.fb-form-object-editable.empty{cursor:default;margin:6px;height:80px;border:dashed 1px #aaa;background-color:#eee}.fb-draggable.dragging{background-color:#ffffff;position:absolute;z-index:800;-webkit-box-shadow:#666 0 0 20px;-moz-box-shadow:#666 0 0 20px;box-shadow:#666 0 0 20px}.fb-required:after{color:#b94a48;content:' *'}.fb-builder{min-height:250px}.popover .control-label{text-align:left}.popover form{width:240px}
+.fb-component{padding:10px;cursor:move}.fb-component input{cursor:move}.fb-component label{cursor:move}.fb-component select{cursor:move}.fb-component textarea{cursor:move}.fb-form-object-editable{padding:10px;border:1px solid #fff}.fb-form-object-editable.active{background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom:1px solid #ddd;-webkit-transition:background-color 1000ms linear;-moz-transition:background-color 1000ms linear;-o-transition:background-color 1000ms linear;transition:background-color 1000ms linear}.fb-form-object-editable:hover{border:1px dashed #aaa}.fb-form-object-editable.fb-draggable{cursor:move}.fb-form-object-editable.fb-draggable input{cursor:move}.fb-form-object-editable.fb-draggable label{cursor:pointer}.fb-form-object-editable.fb-draggable select{cursor:move}.fb-form-object-editable.fb-draggable textarea{cursor:move}.fb-form-object-editable.empty{cursor:default;margin:6px;height:80px;border:dashed 1px #aaa;background-color:#eee}.fb-draggable.dragging{background-color:#ffffff;position:absolute;z-index:800;-webkit-box-shadow:#666 0 0 20px;-moz-box-shadow:#666 0 0 20px;box-shadow:#666 0 0 20px}.fb-required:after{color:#b94a48;content:' *'}.fb-builder{min-height:250px}.popover .control-label{text-align:left}.popover form{width:240px}
diff --git a/dist/angular-form-builder.js b/dist/angular-form-builder.js
index be7fbd4..a716310 100644
--- a/dist/angular-form-builder.js
+++ b/dist/angular-form-builder.js
@@ -373,6 +373,7 @@
             }
             $("div.fb-form-object-editable:not(." + popover.id + ")").popover('hide');
             $popover = $("form." + popover.id).closest('.popover');
+            $(element).addClass('active');
             if ($popover.length > 0) {
               elementOrigin = $(element).offset().top + $(element).height() / 2;
               popoverTop = elementOrigin - $popover.height() / 2;
@@ -407,6 +408,7 @@
               }
             }
             $popover.removeClass('in');
+            $(element).removeClass('active');
             setTimeout(function() {
               return $popover.hide();
             }, 300);
diff --git a/src/angular-form-builder.scss b/src/angular-form-builder.scss
index 2680f5f..4193981 100644
--- a/src/angular-form-builder.scss
+++ b/src/angular-form-builder.scss
@@ -12,6 +12,16 @@
 }
 .fb-form-object-editable {
     padding: 10px;
+    border: 1px solid #fff;
+    &.active {
+        background-color: #f5f5f5;
+        border-top: 1px solid #ddd;
+        border-bottom: 1px solid #ddd;
+        @include transition(background-color 1000ms linear);
+    }
+    &:hover {
+        border: 1px dashed #aaa;
+    }
 }
 .fb-form-object-editable.fb-draggable {
     cursor: move;