diff --git a/app/src/pages/MapContainer.tsx b/app/src/pages/MapContainer.tsx
index 7ed063ed..bb722d8d 100644
--- a/app/src/pages/MapContainer.tsx
+++ b/app/src/pages/MapContainer.tsx
@@ -117,8 +117,11 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
                 {layer.itemType.show_profile_button && (
                   <PopupButton
                     url={layer.itemType.custom_profile_url ?? '/item'}
-                    parameterField={'extended.external_profile_id'}
+                    parameterField={
+                      layer.itemType.custom_profile_url ? 'extended.external_profile_id' : 'id'
+                    }
                     text={layer.itemType.botton_label ?? 'Profile'}
+                    target={layer.itemType.custom_profile_url ? '_parent' : '_self'}
                   />
                 )}
                 {layer.itemType.show_text && <TextView truncate></TextView>}
diff --git a/lib/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx b/lib/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx
index 918e7bed..326a69e8 100644
--- a/lib/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx
+++ b/lib/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx
@@ -15,18 +15,20 @@ export const PopupButton = ({
   parameterField,
   text,
   item,
+  target,
 }: {
   url: string
   parameterField?: string
   text: string
   item?: Item
+  target?: string
 }) => {
   const params = new URLSearchParams(window.location.search)
   const getItemTags = useGetItemTags()
   const parameter = get(item, parameterField ?? 'id')
 
   return (
-    <Link to={`${url}/${parameter || item?.id}?${params}`} target='_parent'>
+    <Link to={`${url}/${parameter || item?.id}?${params}`} target={target ?? '_self'}>
       <button
         style={{
           backgroundColor: `${item?.color ?? (item && (getItemTags(item) && getItemTags(item)[0] && getItemTags(item)[0].color ? getItemTags(item)[0].color : (item?.layer?.markerDefaultColor ?? '#000')))}`,