diff --git a/src/streamlit_app.py b/src/streamlit_app.py
index 2efe445..89ec61b 100644
--- a/src/streamlit_app.py
+++ b/src/streamlit_app.py
@@ -240,18 +240,36 @@ def trading_journal_page():
                                             index=0 if trade['order_type'] == "Market" else 1,
                                             key="update_trade_order_type")
             
+            # Add date and time fields
+            entry_date = st.date_input(
+                "Entry Date", 
+                value=trade['entry_date'].date(),
+                key="update_entry_date"
+            )
+            entry_time = st.time_input(
+                "Entry Time", 
+                value=trade['entry_date'].time(),
+                key="update_entry_time"
+            )
+            
             new_notes = st.text_area("Notes", value=trade['notes'] if trade['notes'] else "")
             
             if st.button("Update Trade"):
-                updates = {
-                    'shares': new_shares,
-                    'entry_price': new_entry,
-                    'target_price': new_target,
-                    'stop_loss': new_stop,
-                    'strategy': new_strategy,
-                    'order_type': new_order_type,
-                    'notes': new_notes
-                }
+                try:
+                    # Combine date and time into datetime
+                    entry_datetime = datetime.combine(entry_date, entry_time)
+                    entry_datetime = pytz.timezone('US/Pacific').localize(entry_datetime)
+                    
+                    updates = {
+                        'entry_date': entry_datetime,
+                        'shares': new_shares,
+                        'entry_price': new_entry,
+                        'target_price': new_target,
+                        'stop_loss': new_stop,
+                        'strategy': new_strategy,
+                        'order_type': new_order_type,
+                        'notes': new_notes
+                    }
                 
                 try:
                     update_trade(trade_id, updates)