diff --git a/uc_fee.module b/uc_fee.module
index fc2df49..c67f8db 100644
--- a/uc_fee.module
+++ b/uc_fee.module
@@ -245,6 +245,13 @@ function uc_fee_order($op, $arg1, $arg2) {
     case 'save':
       $changes = array();
       $line_items = uc_fee_line_item_fee('load', $arg1);
+      
+      // We should only overwrite fees if we are in checkout, and otherwise
+      // apply any user modifications (amount/title changes or deletions)
+      if (uc_order_status_data($arg1->order_status, 'state') != 'in_checkout') {
+        break;
+      }
+      
       if (is_array($arg1->line_items)) {
         //drupal_set_message('<pre>'. var_export($arg1->line_items, TRUE) .'</pre>');
         foreach ($arg1->line_items as $line) {