diff --git a/internal/handlers/expenses.go b/internal/handlers/expenses.go
index a061f13..54c0b9c 100644
--- a/internal/handlers/expenses.go
+++ b/internal/handlers/expenses.go
@@ -398,8 +398,8 @@ func (h *ExpenseHandler) EditExpense(w http.ResponseWriter, r *http.Request) {
 		"Category":        expense.Category,
 		"Date":            expense.Date,
 		"Description":     expense.Description,
-		"BaseCurrency":    expense.BaseCurrency,
-		"ExchangeRate":    0.0,
+		"BaseCurrency":    event.BaseCurrency,
+		"ExchangeRate":    event.ExchangeRate,
 		"ConvertedAmount": strconv.FormatFloat(expense.ConvertedAmount, 'f', 2, 64),
 		"EditID":          expense.ID,
 		"ID":              expense.ID,
diff --git a/templates/receipt_form.html b/templates/receipt_form.html
index 6abcba3..938f4a2 100644
--- a/templates/receipt_form.html
+++ b/templates/receipt_form.html
@@ -75,7 +75,7 @@
 
             <div class="form-group">
                 <label for="description">Description *</label>
-                <textarea id="description" name="description" placeholder="Required notes..." required></textarea>
+                <textarea id="description" name="description" placeholder="Required notes..." required>{{.Description}}</textarea>
             </div>
 
             {{if .BaseCurrency}}