diff --git a/src/components/InfoWindow.vue b/src/components/InfoWindow.vue
index b51d395..acae638 100644
--- a/src/components/InfoWindow.vue
+++ b/src/components/InfoWindow.vue
@@ -1,12 +1,12 @@
 <template>
-  <div ref="infoWindowRef" v-if="hasSlotContent" v-show="mapTilesLoaded">
+  <div ref="infoWindowRef" v-if="hasSlotContent" class="info-window-content">
     <slot />
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, watch, ref, computed, inject, onBeforeUnmount, Comment } from "vue";
-import { apiSymbol, mapSymbol, mapTilesLoadedSymbol } from "../shared/index";
+import { defineComponent, PropType, watch, ref, computed, inject, onBeforeUnmount, Comment, onMounted } from "vue";
+import { apiSymbol, mapSymbol, markerSymbol } from "../shared/index";
 
 const infoWindowEvents = ["closeclick", "content_changed", "domready", "position_changed", "visible", "zindex_changed"];
 
@@ -14,7 +14,7 @@ export default defineComponent({
   props: {
     options: {
       type: Object as PropType<google.maps.InfoWindowOptions>,
-      required: true,
+      default: () => ({}),
     },
   },
 
@@ -27,50 +27,74 @@ export default defineComponent({
 
     const map = inject(mapSymbol, ref(null));
     const api = inject(apiSymbol, ref(null));
-    const mapTilesLoaded = inject(mapTilesLoadedSymbol, ref(false));
+    const anchor = inject(markerSymbol, ref(null));
+    let anchorClickListener: google.maps.MapsEventListener;
 
     const hasSlotContent = computed(() => slots.default?.().some((vnode) => vnode.type !== Comment));
 
-    watch(
-      [map, () => props.options, mapTilesLoaded],
-      ([_, options, newMapTilesLoaded], [oldMap, oldOptions, oldMapTilesLoaded]) => {
-        const checkIfChanged = JSON.stringify(options) !== JSON.stringify(oldOptions) || map.value !== oldMap;
-
-        if (map.value && api.value && (checkIfChanged || (newMapTilesLoaded && !oldMapTilesLoaded))) {
-          if (_infoWindow) {
-            _infoWindow.setOptions({
-              ...options,
-              content: hasSlotContent.value ? infoWindowRef.value : options.content,
-            });
-
-            if (!hasSlotContent.value || mapTilesLoaded.value) _infoWindow.open({ map: map.value });
-          } else {
-            infoWindow.value = _infoWindow = new api.value.InfoWindow({
-              ...options,
-              content: hasSlotContent.value ? infoWindowRef.value : options.content,
-            });
-
-            if (!hasSlotContent.value || mapTilesLoaded.value) _infoWindow.open({ map: map.value });
-
-            infoWindowEvents.forEach((event) => {
-              _infoWindow?.addListener(event, (e: unknown) => emit(event, e));
-            });
+    onMounted(() => {
+      watch(
+        [map, () => props.options],
+        ([_, options], [oldMap, oldOptions]) => {
+          const checkIfChanged = JSON.stringify(options) !== JSON.stringify(oldOptions) || map.value !== oldMap;
+
+          if (map.value && api.value && checkIfChanged) {
+            if (_infoWindow) {
+              _infoWindow.setOptions({
+                ...options,
+                content: hasSlotContent.value ? infoWindowRef.value : options.content,
+              });
+
+              if (!anchor.value) _infoWindow.open({ map: map.value });
+            } else {
+              infoWindow.value = _infoWindow = new api.value.InfoWindow({
+                ...options,
+                content: hasSlotContent.value ? infoWindowRef.value : options.content,
+              });
+
+              if (anchor.value) {
+                anchorClickListener = anchor.value.addListener("click", () => {
+                  _infoWindow.open({
+                    map: map.value,
+                    anchor: anchor.value,
+                  });
+                });
+              } else {
+                _infoWindow.open({ map: map.value });
+              }
+
+              infoWindowEvents.forEach((event) => {
+                _infoWindow?.addListener(event, (e: unknown) => emit(event, e));
+              });
+            }
           }
+        },
+        {
+          immediate: true,
         }
-      },
-      {
-        immediate: true,
-      }
-    );
+      );
+    });
 
     onBeforeUnmount(() => {
+      if (anchorClickListener) anchorClickListener.remove();
+
       if (_infoWindow) {
         api.value?.event.clearInstanceListeners(_infoWindow);
         _infoWindow.close();
       }
     });
 
-    return { infoWindow, infoWindowRef, hasSlotContent, mapTilesLoaded };
+    return { infoWindow, infoWindowRef, hasSlotContent, anchor };
   },
 });
 </script>
+
+<style scoped>
+.info-window-content {
+  display: none;
+}
+
+.mapdiv .info-window-content {
+  display: block;
+}
+</style>
diff --git a/src/components/Marker.ts b/src/components/Marker.ts
index bc2f0ad..4cb9bed 100644
--- a/src/components/Marker.ts
+++ b/src/components/Marker.ts
@@ -1,5 +1,6 @@
-import { defineComponent, PropType, Ref, toRef } from "vue";
+import { defineComponent, PropType, Ref, toRef, provide } from "vue";
 import { IComponentOptions, useSetupMapComponent } from "../composables/index";
+import { markerSymbol } from "../shared/index";
 
 const markerEvents = [
   "animation_changed",
@@ -35,11 +36,13 @@ export default defineComponent({
     },
   },
   emits: markerEvents,
-  setup(props, { emit }) {
+  setup(props, { emit, expose, slots }) {
     const options = toRef(props, "options") as Ref<IComponentOptions>;
-    const marker = useSetupMapComponent("Marker", markerEvents, options, emit);
+    const marker = useSetupMapComponent("Marker", markerEvents, options, emit) as Ref<google.maps.Marker | null>;
+    provide(markerSymbol, marker);
 
-    return { marker };
+    expose({ marker });
+
+    return () => slots.default?.();
   },
-  render: () => null,
 });
diff --git a/src/shared/index.ts b/src/shared/index.ts
index 7916140..7c6c2b1 100644
--- a/src/shared/index.ts
+++ b/src/shared/index.ts
@@ -3,6 +3,7 @@ import { InjectionKey, ref, Ref } from "vue";
 
 export const mapSymbol: InjectionKey<Ref<google.maps.Map | null>> = Symbol("map");
 export const apiSymbol: InjectionKey<Ref<typeof google.maps | null>> = Symbol("api");
+export const markerSymbol: InjectionKey<Ref<google.maps.Marker | null>> = Symbol("marker");
 /**
  * Utilitary flag for components that need to know the map
  * was fully loaded (including its tiles) to decide their behavior