diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/KiroSunsetNotification.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/KiroSunsetNotification.java
index a00bb85a..ad584e6d 100644
--- a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/KiroSunsetNotification.java
+++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/KiroSunsetNotification.java
@@ -40,7 +40,6 @@ protected void createContentArea(final Composite parent) {
             @Override
             public void widgetSelected(final SelectionEvent e) {
                 PluginUtils.openWebpage(Constants.KIRO_SUNSET_LEARN_MORE_URL);
-                dismiss();
             }
         });
 
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/ToolkitNotification.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/ToolkitNotification.java
index 1363930b..1ad9461d 100644
--- a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/ToolkitNotification.java
+++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/ToolkitNotification.java
@@ -72,9 +72,9 @@ protected final String getPopupShellTitle() {
     @Override
     protected final void initializeBounds() {
         Rectangle clArea = getPrimaryClientArea();
-        Point initialSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-        int height = Math.max(initialSize.y, MIN_HEIGHT);
-        int width = Math.min(initialSize.x, MAX_WIDTH);
+        int width = Math.min(getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT).x, MAX_WIDTH);
+        // Recompute height with the constrained width so wrapped text and buttons are accounted for
+        int height = Math.max(getShell().computeSize(width, SWT.DEFAULT).y, MIN_HEIGHT);
         Point size = new Point(width, height);
         // Calculate the position for the new notification
         int x = clArea.x + clArea.width - size.x - PADDING_EDGE;