diff --git a/frontend/src/app/skills/marketplace/page.tsx b/frontend/src/app/skills/marketplace/page.tsx
index 934f078e..e2e8e31e 100644
--- a/frontend/src/app/skills/marketplace/page.tsx
+++ b/frontend/src/app/skills/marketplace/page.tsx
@@ -76,6 +76,9 @@ export default function SkillsMarketplacePage() {
   const [gatewayInstalledById, setGatewayInstalledById] = useState<
     Record<string, boolean>
   >({});
+  const [installedGatewayNamesBySkillId, setInstalledGatewayNamesBySkillId] = useState<
+    Record<string, string[]>
+  >({});
   const [isGatewayStatusLoading, setIsGatewayStatusLoading] = useState(false);
   const [gatewayStatusError, setGatewayStatusError] = useState<string | null>(null);
   const [installingGatewayId, setInstallingGatewayId] = useState<string | null>(null);
@@ -156,6 +159,55 @@ export default function SkillsMarketplacePage() {
     });
   }, [selectedPack, skills]);
 
+  useEffect(() => {
+    let cancelled = false;
+
+    const loadInstalledGatewaysBySkill = async () => {
+      if (!isSignedIn || !isAdmin || gateways.length === 0 || skills.length === 0) {
+        setInstalledGatewayNamesBySkillId({});
+        return;
+      }
+
+      try {
+        const responses = await Promise.all(
+          gateways.map(async (gateway) => {
+            const response = await listMarketplaceSkillsApiV1SkillsMarketplaceGet({
+              gateway_id: gateway.id,
+            });
+            return { gatewayName: gateway.name, response };
+          }),
+        );
+
+        if (cancelled) return;
+
+        const nextInstalledGatewayNamesBySkillId: Record<string, string[]> = {};
+        for (const skill of skills) {
+          nextInstalledGatewayNamesBySkillId[skill.id] = [];
+        }
+
+        for (const { gatewayName, response } of responses) {
+          if (response.status !== 200) continue;
+          for (const skill of response.data) {
+            if (!skill.installed) continue;
+            if (!nextInstalledGatewayNamesBySkillId[skill.id]) continue;
+            nextInstalledGatewayNamesBySkillId[skill.id].push(gatewayName);
+          }
+        }
+
+        setInstalledGatewayNamesBySkillId(nextInstalledGatewayNamesBySkillId);
+      } catch {
+        if (cancelled) return;
+        setInstalledGatewayNamesBySkillId({});
+      }
+    };
+
+    void loadInstalledGatewaysBySkill();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [gateways, isAdmin, isSignedIn, skills]);
+
   const installMutation =
     useInstallMarketplaceSkillApiV1SkillsMarketplaceSkillIdInstallPost<ApiError>(
       {
@@ -168,6 +220,18 @@ export default function SkillsMarketplacePage() {
               ...previous,
               [variables.params.gateway_id]: true,
             }));
+            const gatewayName =
+              gateways.find((gateway) => gateway.id === variables.params.gateway_id)?.name;
+            if (gatewayName) {
+              setInstalledGatewayNamesBySkillId((previous) => {
+                const installedOn = previous[variables.skillId] ?? [];
+                if (installedOn.includes(gatewayName)) return previous;
+                return {
+                  ...previous,
+                  [variables.skillId]: [...installedOn, gatewayName],
+                };
+              });
+            }
           },
         },
       },
@@ -178,10 +242,25 @@ export default function SkillsMarketplacePage() {
     useUninstallMarketplaceSkillApiV1SkillsMarketplaceSkillIdUninstallPost<ApiError>(
       {
         mutation: {
-          onSuccess: async () => {
+          onSuccess: async (_, variables) => {
             await queryClient.invalidateQueries({
               queryKey: ["/api/v1/skills/marketplace"],
             });
+            setGatewayInstalledById((previous) => ({
+              ...previous,
+              [variables.params.gateway_id]: false,
+            }));
+            const gatewayName =
+              gateways.find((gateway) => gateway.id === variables.params.gateway_id)?.name;
+            if (gatewayName) {
+              setInstalledGatewayNamesBySkillId((previous) => {
+                const installedOn = previous[variables.skillId] ?? [];
+                return {
+                  ...previous,
+                  [variables.skillId]: installedOn.filter((name) => name !== gatewayName),
+                };
+              });
+            }
           },
         },
       },
@@ -247,14 +326,24 @@ export default function SkillsMarketplacePage() {
 
   const isMutating = installMutation.isPending || uninstallMutation.isPending;
 
-  const handleInstallToGateway = async (gatewayId: string) => {
+  const handleGatewayInstallAction = async (
+    gatewayId: string,
+    isInstalled: boolean,
+  ) => {
     if (!selectedSkill) return;
     setInstallingGatewayId(gatewayId);
     try {
-      await installMutation.mutateAsync({
-        skillId: selectedSkill.id,
-        params: { gateway_id: gatewayId },
-      });
+      if (isInstalled) {
+        await uninstallMutation.mutateAsync({
+          skillId: selectedSkill.id,
+          params: { gateway_id: gatewayId },
+        });
+      } else {
+        await installMutation.mutateAsync({
+          skillId: selectedSkill.id,
+          params: { gateway_id: gatewayId },
+        });
+      }
     } finally {
       setInstallingGatewayId(null);
     }
@@ -300,19 +389,13 @@ export default function SkillsMarketplacePage() {
               <div className="overflow-hidden rounded-xl border border-slate-200 bg-white shadow-sm">
                 <MarketplaceSkillsTable
                   skills={visibleSkills}
+                  installedGatewayNamesBySkillId={installedGatewayNamesBySkillId}
                   isLoading={skillsQuery.isLoading}
                   sorting={sorting}
                   onSortingChange={onSortingChange}
                   stickyHeader
-                  canInstallActions={Boolean(resolvedGatewayId)}
                   isMutating={isMutating}
                   onSkillClick={setSelectedSkill}
-                  onUninstall={(skill) =>
-                    uninstallMutation.mutate({
-                      skillId: skill.id,
-                      params: { gateway_id: resolvedGatewayId },
-                    })
-                  }
                   emptyState={{
                     title: "No marketplace skills yet",
                     description: "Add packs first, then synced skills will appear here.",
@@ -359,8 +442,9 @@ export default function SkillsMarketplacePage() {
             ) : (
               gateways.map((gateway) => {
                 const isInstalled = gatewayInstalledById[gateway.id] === true;
-                const isInstalling =
-                  installMutation.isPending && installingGatewayId === gateway.id;
+                const isUpdatingGateway =
+                  installingGatewayId === gateway.id &&
+                  (installMutation.isPending || uninstallMutation.isPending);
                 return (
                   <div
                     key={gateway.id}
@@ -368,17 +452,23 @@ export default function SkillsMarketplacePage() {
                   >
                     <div>
                       <p className="text-sm font-medium text-slate-900">{gateway.name}</p>
-                      <p className="text-xs text-slate-500">
-                        {isInstalled ? "Installed" : "Not installed"}
-                      </p>
                     </div>
                     <Button
                       type="button"
                       size="sm"
-                      onClick={() => void handleInstallToGateway(gateway.id)}
-                      disabled={isInstalled || installMutation.isPending}
+                      variant={isInstalled ? "outline" : "primary"}
+                      onClick={() =>
+                        void handleGatewayInstallAction(gateway.id, isInstalled)
+                      }
+                      disabled={installMutation.isPending || uninstallMutation.isPending}
                     >
-                      {isInstalled ? "Installed" : isInstalling ? "Installing..." : "Install"}
+                      {isInstalled
+                        ? isUpdatingGateway
+                          ? "Uninstalling..."
+                          : "Uninstall"
+                        : isUpdatingGateway
+                          ? "Installing..."
+                          : "Install"}
                     </Button>
                   </div>
                 );
@@ -387,8 +477,8 @@ export default function SkillsMarketplacePage() {
             {gatewayStatusError ? (
               <p className="text-sm text-rose-600">{gatewayStatusError}</p>
             ) : null}
-            {installMutation.error ? (
-              <p className="text-sm text-rose-600">{installMutation.error.message}</p>
+            {mutationError ? (
+              <p className="text-sm text-rose-600">{mutationError}</p>
             ) : null}
           </div>
 
diff --git a/frontend/src/components/skills/MarketplaceSkillsTable.tsx b/frontend/src/components/skills/MarketplaceSkillsTable.tsx
index 30b49261..65259b8e 100644
--- a/frontend/src/components/skills/MarketplaceSkillsTable.tsx
+++ b/frontend/src/components/skills/MarketplaceSkillsTable.tsx
@@ -19,15 +19,14 @@ import { truncateText as truncate } from "@/lib/formatters";
 
 type MarketplaceSkillsTableProps = {
   skills: MarketplaceSkillCardRead[];
+  installedGatewayNamesBySkillId?: Record<string, string[]>;
   isLoading?: boolean;
   sorting?: SortingState;
   onSortingChange?: OnChangeFn<SortingState>;
   stickyHeader?: boolean;
   disableSorting?: boolean;
-  canInstallActions: boolean;
   isMutating?: boolean;
   onSkillClick?: (skill: MarketplaceSkillCardRead) => void;
-  onUninstall: (skill: MarketplaceSkillCardRead) => void;
   onDelete?: (skill: MarketplaceSkillCardRead) => void;
   getEditHref?: (skill: MarketplaceSkillCardRead) => string;
   emptyState?: Omit<DataTableEmptyState, "icon"> & {
@@ -88,15 +87,14 @@ const toPackDetailHref = (packUrl: string): string => {
 
 export function MarketplaceSkillsTable({
   skills,
+  installedGatewayNamesBySkillId,
   isLoading = false,
   sorting,
   onSortingChange,
   stickyHeader = false,
   disableSorting = false,
-  canInstallActions,
   isMutating = false,
   onSkillClick,
-  onUninstall,
   onDelete,
   getEditHref,
   emptyState,
@@ -129,7 +127,10 @@ export function MarketplaceSkillsTable({
             ) : (
               <p className="text-sm font-medium text-slate-900">{row.original.name}</p>
             )}
-            <p className="mt-1 line-clamp-2 text-xs text-slate-500">
+            <p
+              className="mt-1 line-clamp-2 text-xs text-slate-500"
+              title={row.original.description || "No description provided."}
+            >
               {row.original.description || "No description provided."}
             </p>
           </div>
@@ -171,11 +172,37 @@ export function MarketplaceSkillsTable({
       {
         accessorKey: "source",
         header: "Source",
-        cell: ({ row }) => (
-          <span className="text-sm text-slate-700" title={row.original.source || ""}>
-            {truncate(row.original.source || "unknown", 36)}
-          </span>
-        ),
+        cell: ({ row }) => {
+          const sourceHref = row.original.source || row.original.source_url;
+          return (
+            <Link
+              href={sourceHref}
+              target="_blank"
+              rel="noreferrer"
+              className="text-sm font-medium text-slate-700 hover:text-blue-600 hover:underline"
+              title={sourceHref}
+            >
+              {truncate(sourceHref, 36)}
+            </Link>
+          );
+        },
+      },
+      {
+        id: "installed_on",
+        header: "Installed On",
+        enableSorting: false,
+        cell: ({ row }) => {
+          const installedOn = installedGatewayNamesBySkillId?.[row.original.id] ?? [];
+          if (installedOn.length === 0) {
+            return <span className="text-sm text-slate-500">-</span>;
+          }
+          const installedOnText = installedOn.join(", ");
+          return (
+            <span className="text-sm text-slate-700" title={installedOnText}>
+              {installedOnText}
+            </span>
+          );
+        },
       },
       {
         accessorKey: "updated_at",
@@ -188,17 +215,6 @@ export function MarketplaceSkillsTable({
         enableSorting: false,
         cell: ({ row }) => (
           <div className="flex justify-end gap-2">
-            {row.original.installed ? (
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                onClick={() => onUninstall(row.original)}
-                disabled={isMutating || !canInstallActions}
-              >
-                Uninstall
-              </Button>
-            ) : null}
             {getEditHref ? (
               <Link
                 href={getEditHref(row.original)}
@@ -225,12 +241,11 @@ export function MarketplaceSkillsTable({
 
     return baseColumns;
   }, [
-    canInstallActions,
     getEditHref,
+    installedGatewayNamesBySkillId,
     isMutating,
     onDelete,
     onSkillClick,
-    onUninstall,
   ]);
 
   // eslint-disable-next-line react-hooks/incompatible-library