diff --git a/app/competitions/[competitionId]/props/[propId]/competition-prop-view.tsx b/app/competitions/[competitionId]/props/[propId]/competition-prop-view.tsx
index 1dd1dde..1e27598 100644
--- a/app/competitions/[competitionId]/props/[propId]/competition-prop-view.tsx
+++ b/app/competitions/[competitionId]/props/[propId]/competition-prop-view.tsx
@@ -3,7 +3,7 @@
 import { useState, useRef } from "react";
 import { useRouter } from "next/navigation";
 import Link from "next/link";
-import { ChevronRight, Calendar, CalendarClock, Lock } from "lucide-react";
+import { ChevronRight, Calendar, CalendarClock, Lock, Pencil } from "lucide-react";
 import { PropWithUserForecast } from "@/types/db_types";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -253,6 +253,17 @@ export function CompetitionPropView({
                 </p>
               )}
             </div>
+            {isAdmin && (
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => setIsEditDialogOpen(true)}
+                className="shrink-0"
+              >
+                <Pencil className="h-3.5 w-3.5 mr-1.5" />
+                Edit
+              </Button>
+            )}
           </div>
 
           {/* Deadline info */}
diff --git a/app/competitions/[competitionId]/props/[propId]/page.tsx b/app/competitions/[competitionId]/props/[propId]/page.tsx
index 1907a4b..ea9d6f9 100644
--- a/app/competitions/[competitionId]/props/[propId]/page.tsx
+++ b/app/competitions/[competitionId]/props/[propId]/page.tsx
@@ -58,21 +58,20 @@ async function CompetitionPropPageContent({
   }
   const competition = competitionResult.data;
 
-  // For private competitions, verify membership
-  if (competition.is_private) {
-    const roleResult = await getCurrentUserRole(competitionId);
-    if (!roleResult.success) {
-      return <ErrorPage title={roleResult.error} />;
-    }
+  const roleResult = await getCurrentUserRole(competitionId);
+  if (!roleResult.success) {
+    return <ErrorPage title={roleResult.error} />;
+  }
+  const userRole = roleResult.data;
 
-    if (roleResult.data === null) {
-      return (
-        <InaccessiblePage
-          title="Private Competition"
-          message="You are not a member of this competition."
-        />
-      );
-    }
+  // For private competitions, verify membership
+  if (competition.is_private && userRole === null) {
+    return (
+      <InaccessiblePage
+        title="Private Competition"
+        message="You are not a member of this competition."
+      />
+    );
   }
 
   // Get the prop with user's forecast
@@ -102,7 +101,7 @@ async function CompetitionPropPageContent({
       competitionId={competitionId}
       competitionName={competition.name}
       isForecastingOpen={isForecastingOpen}
-      isAdmin={user.is_admin}
+      isAdmin={user.is_admin || userRole === "admin"}
     />
   );
 }