diff --git a/src/Collapse.svelte b/src/Collapse.svelte
index 8f966899..294ce686 100644
--- a/src/Collapse.svelte
+++ b/src/Collapse.svelte
@@ -15,65 +15,63 @@
   export let onEntered = () => dispatch('open');
   export let onExiting = () => dispatch('closing');
   export let onExited = () => dispatch('close');
-  export let expand = false;
   export let toggler = null;
+  let transitioning = false;
 
   onMount(() => toggle(toggler, (e) => {
-    isOpen = !isOpen;
-    e.preventDefault();
+    if (!transitioning) {
+      isOpen = !isOpen;
+    }
   }));
 
   $: classes = classnames(className, {
     'collapse-horizontal': horizontal,
-    'navbar-collapse': navbar
+    'navbar-collapse': navbar,
+    'd-none': !isOpen
   });
 
-  let windowWidth = 0;
-  let _wasMaximized = false;
-
-  // TODO wrong to hardcode these here - come from Bootstrap CSS only
-  const minWidth = {};
-  minWidth['xs'] = 0;
-  minWidth['sm'] = 576;
-  minWidth['md'] = 768;
-  minWidth['lg'] = 992;
-  minWidth['xl'] = 1200;
-
   function notify() {
     dispatch('update', isOpen);
   }
+  
 
-  $: if (navbar && expand) {
-    if (windowWidth >= minWidth[expand] && !isOpen) {
-      isOpen = true;
-      _wasMaximized = true;
-      notify();
-    } else if (windowWidth < minWidth[expand] && _wasMaximized) {
-      isOpen = false;
-      _wasMaximized = false;
-      notify();
-    }
+  function _onEntering(event) {
+    transitioning = true;
+    onEntering(event);
+  }
+  
+  function _onEntered(event) {
+    transitioning = false;
+    onEntered(event);
+  }
+  
+  function _onExiting(event) {
+    transitioning = true;
+    onExiting(event);
+  }
+  
+  function _onExited(event) {
+    transitioning = false;
+    onExited(event);
   }
 </script>
 
-<svelte:window bind:innerWidth={windowWidth} />
-
-{#if isOpen}
+{#key isOpen}
   <div
-    style={navbar ? undefined : 'overflow: hidden;'}
-    {...$$restProps}
-    class={classes}
-    in:collapseIn={{ horizontal }}
-    out:collapseOut|local={{ horizontal }}
-    on:introstart
-    on:introend
-    on:outrostart
-    on:outroend
-    on:introstart={onEntering}
-    on:introend={onEntered}
-    on:outrostart={onExiting}
-    on:outroend={onExited}
+      style={navbar ? undefined : 'overflow: hidden;'}
+      {...$$restProps}
+      class={classes}
+      in:collapseIn={{ horizontal }}
+      out:collapseOut|local={{ horizontal }}
+      on:introstart
+      on:introend
+      on:outrostart
+      on:outroend
+      on:introstart={_onEntering}
+      on:introend={_onEntered}
+      on:outrostart={_onExiting}
+      on:outroend={_onExited}
   >
     <slot />
   </div>
-{/if}
+{/key}
diff --git a/src/Popover.svelte b/src/Popover.svelte
index dc1a5b29..097bd17e 100644
--- a/src/Popover.svelte
+++ b/src/Popover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from 'svelte';
-  import { createPopper } from '@popperjs/core/dist/esm/popper';
+  import { createPopper } from '@popperjs/core';
   import classnames from './utils';
   import InlineContainer from './InlineContainer.svelte';
   import Portal from './Portal.svelte';
@@ -134,4 +134,4 @@
       </div>
     </div>
   </svelte:component>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/src/Tooltip.svelte b/src/Tooltip.svelte
index d7fb9eeb..cd342968 100644
--- a/src/Tooltip.svelte
+++ b/src/Tooltip.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onDestroy, onMount } from 'svelte';
-  import { createPopper } from '@popperjs/core/dist/esm/popper';
+  import { createPopper } from '@popperjs/core';
   import classnames, { uuid } from './utils';
   import InlineContainer from './InlineContainer.svelte';
   import Portal from './Portal.svelte';
@@ -140,4 +140,4 @@
       </div>
     </div>
   </svelte:component>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/src/popper.js b/src/popper.js
index 9f5f4eaf..db5427ff 100644
--- a/src/popper.js
+++ b/src/popper.js
@@ -1,4 +1,4 @@
-import { createPopper } from '@popperjs/core/dist/esm/popper';
+import { createPopper } from '@popperjs/core';
 
 // Code derived from https://github.com/bryanmylee/svelte-popperjs/blob/master/src/index.ts
 export function createPopperActions(initOptions) {
@@ -52,4 +52,4 @@ export function createPopperActions(initOptions) {
   };
 
   return [referenceAction, contentAction, () => popperInstance];
-}
+}
\ No newline at end of file