diff --git a/boxes.module b/boxes.module
index a5ec41a..8541cc3 100644
--- a/boxes.module
+++ b/boxes.module
@@ -476,6 +476,20 @@ function boxes_box_form($form, &$form_state) {
 }
 
 /**
+ * Implements hook_form_alter().
+ */
+function boxes_form_alter(&$form, &$form_state, $form_id) {
+  $path = implode('/', array_slice(arg(), 0, 5));
+  if (($form_id != 'block_admin_configure' || $path != 'admin/structure/block/manage/boxes') && 
+      ($form_id != 'boxes_add_form' || arg(3) != 'box-add')) {
+    return;
+  }
+  // Use the Box form submit handler and properly redirect to the correct admin page
+  $form['#submit'][0] = 'boxes_box_form_submit';
+  $form['#action'] = '?destination=admin/structure/block';
+}
+
+/**
  * Submit handler for the inline form.
  */
 function boxes_box_form_submit($form, $form_state) {