diff --git a/packages/react/src/components/FormattingToolbar/DefaultButtons/CreateLinkButton.tsx b/packages/react/src/components/FormattingToolbar/DefaultButtons/CreateLinkButton.tsx
index 8ae277dc68..2b53ddd95f 100644
--- a/packages/react/src/components/FormattingToolbar/DefaultButtons/CreateLinkButton.tsx
+++ b/packages/react/src/components/FormattingToolbar/DefaultButtons/CreateLinkButton.tsx
@@ -84,6 +84,11 @@ export const CreateLinkButton = () => {
       };
     },
   });
+  useEffect(() => {
+    if (state?.url === undefined) {
+      setShowPopover(false);
+    }
+  }, [state?.url]);
 
   // Makes Ctrl+K/Meta+K open link creation popover.
   useEffect(() => {
@@ -107,7 +112,10 @@ export const CreateLinkButton = () => {
   }
 
   return (
-    <Components.Generic.Popover.Root open={showPopover}>
+    <Components.Generic.Popover.Root
+      open={showPopover}
+      onOpenChange={setShowPopover}
+    >
       <Components.Generic.Popover.Trigger>
         {/* TODO: hide tooltip on click */}
         <Components.FormattingToolbar.Button
@@ -120,7 +128,7 @@ export const CreateLinkButton = () => {
             dict.generic.ctrl_shortcut,
           )}
           icon={<RiLink />}
-          onClick={() => setShowPopover(true)}
+          onClick={() => setShowPopover((open) => !open)}
         />
       </Components.Generic.Popover.Trigger>
       <Components.Generic.Popover.Content
diff --git a/packages/react/src/components/SuggestionMenu/hooks/useSuggestionMenuKeyboardHandler.ts b/packages/react/src/components/SuggestionMenu/hooks/useSuggestionMenuKeyboardHandler.ts
index 8d367ffdcf..c8faa4b8ca 100644
--- a/packages/react/src/components/SuggestionMenu/hooks/useSuggestionMenuKeyboardHandler.ts
+++ b/packages/react/src/components/SuggestionMenu/hooks/useSuggestionMenuKeyboardHandler.ts
@@ -4,7 +4,7 @@ import React, { useState } from "react";
 // & down arrow keys are used to select an item, enter is used to execute it.
 export function useSuggestionMenuKeyboardHandler<Item>(
   items: Item[],
-  onItemClick?: (item: Item) => void
+  onItemClick?: (item: Item) => void,
 ) {
   const [selectedIndex, setSelectedIndex] = useState<number>(0);
 
@@ -23,7 +23,6 @@ export function useSuggestionMenuKeyboardHandler<Item>(
       }
 
       if (event.key === "ArrowDown") {
-        // debugger;
         event.preventDefault();
 
         if (items.length) {
@@ -33,6 +32,26 @@ export function useSuggestionMenuKeyboardHandler<Item>(
         return true;
       }
 
+      if (event.key === "PageUp") {
+        event.preventDefault();
+
+        if (items.length) {
+          setSelectedIndex(0);
+        }
+
+        return true;
+      }
+
+      if (event.key === "PageDown") {
+        event.preventDefault();
+
+        if (items.length) {
+          setSelectedIndex(items.length - 1);
+        }
+
+        return true;
+      }
+
       const isComposing = isReactEvent(event)
         ? event.nativeEvent.isComposing
         : event.isComposing;
@@ -53,7 +72,7 @@ export function useSuggestionMenuKeyboardHandler<Item>(
 }
 
 function isReactEvent(
-  event: KeyboardEvent | React.KeyboardEvent
+  event: KeyboardEvent | React.KeyboardEvent,
 ): event is React.KeyboardEvent {
   return (event as React.KeyboardEvent).nativeEvent !== undefined;
 }