diff --git a/plugins/views_boxes_view.inc b/plugins/views_boxes_view.inc
index a688072..3bbb124 100644
--- a/plugins/views_boxes_view.inc
+++ b/plugins/views_boxes_view.inc
@@ -17,6 +17,7 @@ class views_boxes_view extends boxes_box {
       'view' => '',
       'settings' => array(),
       'view_object' => NULL,
+      'hide_if_empty' => 0,
       'view_more_text' => '',
       'view_more_link' => '',
       'expose_filters' => FALSE,
@@ -349,6 +350,12 @@ class views_boxes_view extends boxes_box {
           '#markup' => t('No view selected'),
         );
     }
+    $form['hide_if_empty'] = array(
+    	'#title' => t('Hide Box if no results'),
+    	'#description' => t('Do not display the box if the view does not return any results.'),
+    	'#type' => 'checkbox',
+    	'#default_value' => $this->options['hide_if_empty'],
+    );
     $form['view_more_text'] = array(
       '#title' => t('More link text'),
       '#description' => t('Optional text for a custom link that follows the listing.'),
@@ -450,13 +457,15 @@ class views_boxes_view extends boxes_box {
       'title' => $title,
       'subject' => $title,
       'content' => $content,
-      'is_empty' => FALSE,
+      'is_empty' => TRUE,
+      'hide_if_empty' => (isset($this->options['hide_if_empty'])) ? $this->options['hide_if_empty'] : 0,
       'view_more_text' => $this->options['view_more_text'],
       'view_more_link' => $this->options['view_more_link'],
     );
     
-    if ((isset($view)) && (count($view->result) == 0) && !boxes_access_edit()) {
-      $box['is_empty'] = TRUE;
+    if ((isset($view)) && (count($view->result) == 0) && $box['hide_if_empty']) {
+      $box['content'] = '';
+      $box['title'] = '<none>';
     }
     
     if ($display_name) {