diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java
index 9a7115c..2ed5764 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java
@@ -162,7 +162,11 @@
 			
 			this.textItem.setWidth(width);
 			toolBarParent.layout(new @NonNull Control[] { this.control });
-			toolBarParent.pack(true);
+			if ((this.options & VIEW_TOOLBAR) != 0) {
+				toolBarParent.pack(true);
+				final var viewComposite= nonNullAssert(toolBarParent.getParent());
+				viewComposite.layout(new @NonNull Control[] { toolBarParent });
+			}
 		}
 	}
 	
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
index 86315eb..a80318b 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
@@ -207,7 +207,8 @@
 		public void show() {
 			final GridData gd= (GridData)this.toolBar.getLayoutData();
 			gd.exclude= false;
-			this.toolBar.getParent().layout(true, true);
+			this.toolBar.getParent().layout(new @NonNull Control[] { this.toolBar });
+			
 			this.searchTextItem.getSearchText().setFocus();
 		}