diff --git a/weight.module b/weight.module
index 7d41df4..bd89413 100644
--- a/weight.module
+++ b/weight.module
@@ -338,6 +338,31 @@ function weight_preprocess_views_view_table(&$variables) {
 }
 
 /**
+ * Implements hook_form_alter().
+ */
+function weight_form_alter(&$form, &$form_state, $form_id) {
+  
+  // Remove save button on empty view
+
+  // Check if it is from from views
+  if (strpos($form_id, 'views_form_') === 0) {
+    // Check if view contains weight elements
+	if (isset($form_state['build_info']) 
+		&& isset($form_state['build_info']['args']) 
+		&& isset($form_state['build_info']['args'][0]) 
+		&& isset($form_state['build_info']['args'][0]->query) 
+		&& isset($form_state['build_info']['args'][0]->query->table_queue)  
+		&& isset($form_state['build_info']['args'][0]->query->table_queue['field_data_weight'])) {
+      if (isset($form_state['build_info']['args'][0]->result)
+		&& !count($form_state['build_info']['args'][0]->result)) {
+        // No point in having a "Save" button on empty view.
+        unset($form['actions']);
+      }
+	}
+  }
+}
+
+/**
  * Get weight settings for a content type.
  */
 function _weight_get_settings($type = NULL) {