diff --git a/client/apps/portal-administration/src/components/Actions/ActivateSelectedWithContextButton.tsx b/client/apps/portal-administration/src/components/Actions/ActivateSelectedWithContextButton.tsx
index 5d00eca8..d2fb2e0c 100644
--- a/client/apps/portal-administration/src/components/Actions/ActivateSelectedWithContextButton.tsx
+++ b/client/apps/portal-administration/src/components/Actions/ActivateSelectedWithContextButton.tsx
@@ -1,7 +1,8 @@
 import { Button, Icon } from '@equinor/eds-core-react';
-import { PortalApp, PortalApplication } from '../../types';
+import {  PortalApplication } from '../../types';
 
 import { add_circle_filled } from '@equinor/eds-icons';
+import { useMemo } from 'react';
 
 type ActivateSelectedWithContextButtonProps = {
 	selection: PortalApplication[];
@@ -12,7 +13,9 @@ export const ActivateSelectedWithContextButton = ({
 	selection,
 	activateSelectedWithContext,
 }: ActivateSelectedWithContextButtonProps) => {
-	const isActive = selection.some((a) => !a.isActive) && selection.length < 2;
+
+  // Only active if one is selected or the selected has contextTypes active
+	const isActive =  useMemo(()=> (!!selection.find(app => app.contextTypes.length !== 0) && selection.some((a) => !a.isActive) && selection.length < 2),[selection]);
 
 	if (!isActive) {
 		return null;
diff --git a/client/apps/portal-administration/src/components/PortalApps/ContextAppSideSheet.tsx b/client/apps/portal-administration/src/components/PortalApps/ContextAppSideSheet.tsx
index 44b3ca64..1a9a4e59 100644
--- a/client/apps/portal-administration/src/components/PortalApps/ContextAppSideSheet.tsx
+++ b/client/apps/portal-administration/src/components/PortalApps/ContextAppSideSheet.tsx
@@ -78,9 +78,10 @@ export function ContextAppSideSheet({
 	const { activeContexts, contextTypes } = useActiveOnboardedContext();
 	const [selectedContexts, setSelectedContexts] = useState<OnboardedContext[]>([]);
 
-	const { data: activeApp, isLoading } = useGetPortalApp(activePortalId, app.key);
+	const { data: activeApp, isLoading } = useGetPortalApp(activePortalId, app.appManifest.appKey);
 
 	const contexts: OnboardedContext[] = useMemo(() => {
+    console.log(activeApp)
 		if (!activeApp || !activeContexts) return [];
 
 		return activeContexts.map((context) => ({
@@ -103,7 +104,7 @@ export function ContextAppSideSheet({
 			minWidth={1200}
 			isDismissable={true}
 		>
-			<SideSheet.Title title={`Activate ${app.appManifest.name} Application`} />
+			<SideSheet.Title title={`Activate ${app.appManifest.displayName} Application`} />
 			<SideSheet.SubTitle subTitle="Activate application with contexts" />
 			<SideSheet.Actions></SideSheet.Actions>
 			<SideSheet.Content>
@@ -165,9 +166,9 @@ export function ContextAppSideSheet({
 											onCellValueChanged: (event) => {
 												if (event.newValue) {
 													console.log('Activate context', event.data);
-													add({ appKey: app.key, contextIds: [event.data.contextId] });
+													add({ appKey: app.appManifest.appKey, contextIds: [event.data.contextId] });
 												} else {
-													remove({ appKey: app.key, contextIds: [event.data.contextId] });
+													remove({ appKey: app.appManifest.appKey, contextIds: [event.data.contextId] });
 												}
 											},
 										},
@@ -200,7 +201,7 @@ export function ContextAppSideSheet({
 								<Button
 									onClick={() => {
 										add({
-											appKey: app.key,
+											appKey: app.appManifest.appKey,
 											contextIds: selectedContexts
 												.filter((a) => !a.isActive)
 												.map((a) => a.contextId),
@@ -214,7 +215,7 @@ export function ContextAppSideSheet({
 								<Button
 									onClick={() => {
 										remove({
-											appKey: app.key,
+											appKey: app.appManifest.appKey,
 											contextIds: selectedContexts
 												.filter((a) => a.isActive)
 												.map((a) => a.contextId),
diff --git a/client/apps/portal-administration/src/query/apps-mutations.ts b/client/apps/portal-administration/src/query/apps-mutations.ts
index 6874ad4a..50ae2d09 100644
--- a/client/apps/portal-administration/src/query/apps-mutations.ts
+++ b/client/apps/portal-administration/src/query/apps-mutations.ts
@@ -1,17 +1,17 @@
 import { QueryClient } from '@tanstack/react-query';
-import { OnboardedContext, PortalApplication } from '../types';
+import {  PortalApplication } from '../types';
 
 export const mutatePortalApps = (queryClient: QueryClient, portalId: string | undefined, apps: PortalApplication[]) => {
 	queryClient.cancelQueries({ queryKey: ['portal-onboarded-apps', portalId] });
 
 	const prevApps = queryClient.getQueryData<PortalApplication[]>(['portal-onboarded-apps', portalId]) || [];
 
-	const newApps = prevApps.map((a) => {
-		const isActive = apps.find((app) => app.key === a.key);
+	const newApps = prevApps.map((prevApp) => {
+		const isActive = apps.find((app) => app.appManifest.appKey === prevApp.appManifest.appKey);
 		if (isActive) {
-			return { ...a, isActive: true };
+			return { ...prevApp, isActive: true };
 		}
-		return a;
+		return prevApp;
 	});
 
 	queryClient.setQueryData(['portal-onboarded-apps', portalId], newApps);
@@ -26,8 +26,8 @@ export const mutateDeletePortalApps = (
 	queryClient.cancelQueries({ queryKey: ['portal-onboarded-apps', portalId] });
 	const prevApps = queryClient.getQueryData<PortalApplication[]>(['portal-onboarded-apps', portalId]) || [];
 
-	const appKeys = apps.map((a) => a.key);
-	const newApps = prevApps?.map((a) => (appKeys.includes(a.key) ? { ...a, isActive: false } : a));
+	const appKeys = apps.map((app) => app.appManifest.appKey);
+	const newApps = prevApps?.map((prevApp) => (appKeys.includes(prevApp.appManifest.appKey) ? { ...prevApp, isActive: false } : prevApp));
 	queryClient.setQueryData(['portal-onboarded-apps', portalId], newApps);
 	return { prevApps, newApps };
 };
diff --git a/client/apps/portal-administration/src/query/apps-queries.ts b/client/apps/portal-administration/src/query/apps-queries.ts
index 352a8945..6f97a2ed 100644
--- a/client/apps/portal-administration/src/query/apps-queries.ts
+++ b/client/apps/portal-administration/src/query/apps-queries.ts
@@ -125,7 +125,7 @@ export const addPortalApps = async (client: IHttpClient, portalApps: PortalAppli
 	const results: Result[] = [];
 
 	for (const app of portalApps) {
-		const result = await addPortalApp(client, app.key, portalId);
+		const result = await addPortalApp(client, app.appManifest.appKey, portalId);
 		results.push(result);
 	}
 
@@ -165,7 +165,7 @@ export const removePortalApps = async (client: IHttpClient, portalApps: PortalAp
 	const results: Result[] = [];
 
 	for (const app of portalApps) {
-		const result = await removePortalApp(client, app.key, portalId);
+		const result = await removePortalApp(client, app.appManifest.appKey, portalId);
 		results.push(result);
 	}
 
diff --git a/client/apps/portal-administration/src/types/index.ts b/client/apps/portal-administration/src/types/index.ts
index 1d51b8d7..d5cb295a 100644
--- a/client/apps/portal-administration/src/types/index.ts
+++ b/client/apps/portal-administration/src/types/index.ts
@@ -65,7 +65,7 @@ export type PortalApp = {
 
 export type PortalApplication = {
 	id: string;
-	key: string;
+	appKey: string;
 	contextTypes: string[];
 	appManifest: AppManifest;
 	isActive?: boolean;
@@ -80,7 +80,7 @@ export type PortalAppMutation = {
 };
 
 export type AppManifestResponse = {
-	key: string;
+	appKey: string;
 	contextTypes: ContextType[];
 	appManifest: AppManifest;
 };