diff --git a/includes/class-hvac-shortcodes.php b/includes/class-hvac-shortcodes.php
index b7bf75a5..7a224f17 100644
--- a/includes/class-hvac-shortcodes.php
+++ b/includes/class-hvac-shortcodes.php
@@ -272,8 +272,9 @@ class HVAC_Shortcodes {
             return '<p>' . __('Event management requires The Events Calendar Community Events add-on.', 'hvac-community-events') . '</p>';
         }
         
-        // Return the tribe shortcode
-        return '[tribe_community_events]';
+        // Return the tribe shortcode with view parameter for submission form
+        // This enables both new event creation and existing event editing
+        return '[tribe_community_events view="submission_form"]';
     }
     
     /**
diff --git a/templates/page-manage-event.php b/templates/page-manage-event.php
index cc996a6f..b765b15a 100644
--- a/templates/page-manage-event.php
+++ b/templates/page-manage-event.php
@@ -79,8 +79,8 @@ get_header();
                 echo do_shortcode($raw_content);
             endwhile;
         else:
-            // Fallback - show the shortcode directly
-            echo do_shortcode('[tribe_community_events]');
+            // Fallback - show the shortcode directly with submission form view
+            echo do_shortcode('[tribe_community_events view="submission_form"]');
         endif;
         ?>
     </div>