diff --git a/browser/CHANGELOG.md b/browser/CHANGELOG.md
index 8675963dc..d536275f0 100644
--- a/browser/CHANGELOG.md
+++ b/browser/CHANGELOG.md
@@ -8,6 +8,7 @@ This changelog covers all five packages, as they are (for now) updated as a whol
 
 - [#981](https://github.com/atomicdata-dev/atomic-server/issues/981) Fix bug where the service worker would not update cache with updated code.
 - [#989](https://github.com/atomicdata-dev/atomic-server/issues/989) Added an edit button to the resource selector inputs.
+- [#992](https://github.com/atomicdata-dev/atomic-server/issues/992) Fix Searchbox overflowing when displaying long names.
 
 ### @tomic/cli
 
diff --git a/browser/data-browser/src/components/Collapse.tsx b/browser/data-browser/src/components/Collapse.tsx
index e261e61c3..43d4b6aab 100644
--- a/browser/data-browser/src/components/Collapse.tsx
+++ b/browser/data-browser/src/components/Collapse.tsx
@@ -52,7 +52,10 @@ const GridCollapser = styled.div<GridCollapserProps>`
   display: grid;
   grid-template-rows: ${({ open }) => (open ? '1fr' : '0fr')};
   grid-template-columns: 100%;
-  transition: grid-template-rows ${() => ANIMATION_DURATION()}ms ease-in-out;
+  transition:
+    grid-template-rows ${() => ANIMATION_DURATION()}ms ease-in-out,
+    // In some cases, a margin is added. This needs to animate as well.
+    margin-top ${() => ANIMATION_DURATION()}ms ease-in-out;
 
   @media (prefers-reduced-motion) {
     transition: unset;
diff --git a/browser/data-browser/src/components/Containers.tsx b/browser/data-browser/src/components/Containers.tsx
index 117a3f37d..673276ae9 100644
--- a/browser/data-browser/src/components/Containers.tsx
+++ b/browser/data-browser/src/components/Containers.tsx
@@ -1,24 +1,27 @@
-import { styled } from 'styled-components';
+import { css, styled } from 'styled-components';
+import { LAYOUT_CONTAINER } from '../helpers/containers';
 
-/** Centered column */
-export const ContainerNarrow = styled.div`
-  width: min(100%, ${props => props.theme.containerWidth}rem);
+const common = css`
   margin: auto;
-  padding: ${props => props.theme.margin}rem;
-  // Extra space for the navbar below
+  padding: ${p => p.theme.size()};
+  container: ${LAYOUT_CONTAINER} / inline-size;
   padding-bottom: 10rem;
 `;
 
+/** Centered column */
+export const ContainerNarrow = styled.div`
+  width: min(100%, ${p => p.theme.containerWidth}rem);
+  ${common}
+`;
+
 export const ContainerWide = styled.div`
-  width: min(100%, ${props => props.theme.containerWidthWide});
-  margin: auto;
-  padding: ${props => props.theme.margin}rem;
-  // Extra space for the navbar below
-  padding-bottom: 10rem;
+  width: min(100%, ${p => p.theme.containerWidthWide});
+  ${common}
 `;
 
 /** Full-page wrapper */
 export const ContainerFull = styled.div`
-  padding: ${props => props.theme.margin}rem;
+  container: ${LAYOUT_CONTAINER} / inline-size;
+  padding: ${p => p.theme.size()};
   padding-bottom: 10rem;
 `;
diff --git a/browser/data-browser/src/components/Dialog/index.tsx b/browser/data-browser/src/components/Dialog/index.tsx
index abd95948c..9e70549b3 100644
--- a/browser/data-browser/src/components/Dialog/index.tsx
+++ b/browser/data-browser/src/components/Dialog/index.tsx
@@ -16,6 +16,7 @@ import {
 import { useDialog } from './useDialog';
 import { useControlLock } from '../../hooks/useControlLock';
 import { useDialogGlobalContext } from './DialogGlobalContextProvider';
+import { DIALOG_CONTENT_CONTAINER } from '../../helpers/containers';
 
 export interface InternalDialogProps {
   show: boolean;
@@ -216,16 +217,19 @@ const DialogContentSlot = styled(Slot)`
   overflow-y: visible;
   /* The main section should leave room for the footer */
   max-height: calc(80vh - 8rem);
-  padding-bottom: ${({ theme }) => theme.margin}rem;
+  padding-bottom: ${p => p.theme.size()};
   // Position the scrollbar against the side of the dialog without any spacing inbetween.
   // This also fixes ugly horizontal shadow cutoff.
-  margin-inline: -${p => p.theme.margin}rem;
-  padding-inline: ${p => p.theme.margin}rem;
+  margin-inline: -${p => p.theme.size()};
+  padding-inline: ${p => p.theme.size()};
+
+  container: ${DIALOG_CONTENT_CONTAINER} / inline-size;
+  scrollbar-gutter: stable;
 `;
 
 const DialogActionsSlot = styled(Slot)`
   display: flex;
-  gap: ${p => p.theme.margin}rem;
+  gap: ${p => p.theme.size()};
   align-items: center;
   justify-content: flex-end;
   border-top: 1px solid ${props => props.theme.colors.bg2};
@@ -238,7 +242,7 @@ const StyledInnerDialog = styled.div`
   grid-template-rows: 1fr auto auto;
   gap: 1rem;
   grid-template-areas: 'title close' 'content content' 'actions actions';
-  max-block-size: calc(100vh - ${p => p.theme.margin}rem * 2);
+  max-block-size: calc(100vh - ${p => p.theme.size()} * 2);
 `;
 
 const fadeInForground = keyframes`
@@ -264,18 +268,17 @@ const fadeInBackground = keyframes`
 `;
 
 const StyledDialog = styled.dialog<{ $width?: CSS.Property.Width }>`
-  --animation-speed: 500ms;
   --dialog-width: min(90vw, ${p => p.$width ?? '60ch'});
 
   ${VAR_DIALOG_INNER_WIDTH}: calc(
-    var(--dialog-width) - 2 * ${p => p.theme.margin}rem
+    var(--dialog-width) - 2 * ${p => p.theme.size()}
   );
 
   box-sizing: border-box;
   inset: 0px;
   position: relative;
   z-index: ${p => p.theme.zIndex.dialog};
-  padding: ${props => props.theme.margin}rem;
+  padding: ${p => p.theme.size()};
   color: ${props => props.theme.colors.text};
   background-color: ${props => props.theme.colors.bg};
   border-radius: ${props => props.theme.radius};
diff --git a/browser/data-browser/src/components/forms/FilePicker/SelectedFileLayout.tsx b/browser/data-browser/src/components/forms/FilePicker/SelectedFileLayout.tsx
index 3179afd84..45117bb4f 100644
--- a/browser/data-browser/src/components/forms/FilePicker/SelectedFileLayout.tsx
+++ b/browser/data-browser/src/components/forms/FilePicker/SelectedFileLayout.tsx
@@ -20,7 +20,7 @@ export function SelectedFileLayout({
 }: PropsWithChildren<SelectedFileLayoutProps>): React.JSX.Element {
   return (
     <Wrapper>
-      <Row>
+      <Row center>
         <Title>{title}</Title>
         {!disabled && (
           <IconButton title='clear' onClick={onClear}>
@@ -35,7 +35,8 @@ export function SelectedFileLayout({
 }
 
 const Title = styled.span`
-  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
 `;
 
 const Wrapper = styled.div`
diff --git a/browser/data-browser/src/components/forms/InputStyles.tsx b/browser/data-browser/src/components/forms/InputStyles.tsx
index 8f4a6c2c7..c4d5ec39e 100644
--- a/browser/data-browser/src/components/forms/InputStyles.tsx
+++ b/browser/data-browser/src/components/forms/InputStyles.tsx
@@ -5,6 +5,11 @@ export const FieldStyled = styled.div`
   margin-bottom: ${props => props.theme.size()};
   border: none;
   background-color: none;
+
+  // Removes default 1px margin on fieldset.
+  &:is(fieldset) {
+    margin-inline: 0;
+  }
 `;
 
 export const LabelWrapper = styled.div`
diff --git a/browser/data-browser/src/components/forms/ResourceForm.tsx b/browser/data-browser/src/components/forms/ResourceForm.tsx
index 78ea28dc7..ebeb47dcd 100644
--- a/browser/data-browser/src/components/forms/ResourceForm.tsx
+++ b/browser/data-browser/src/components/forms/ResourceForm.tsx
@@ -240,11 +240,6 @@ export function ResourceForm({
           <Button
             title={'show / hide advanced form fields'}
             clean
-            style={{
-              display: 'flex',
-              marginBottom: '1rem',
-              alignItems: 'center',
-            }}
             onClick={() => setShowAdvanced(!showAdvanced)}
           >
             <Row as='strong' gap='0.4rem' center>
@@ -309,5 +304,5 @@ export function ResourceForm({
 }
 
 const StyledCollapse = styled(Collapse)`
-  max-width: 70ch;
+  margin-top: ${p => (p.open ? '1rem' : '0')};
 `;
diff --git a/browser/data-browser/src/components/forms/SearchBox/SearchBox.tsx b/browser/data-browser/src/components/forms/SearchBox/SearchBox.tsx
index 74856765b..7bc58a09e 100644
--- a/browser/data-browser/src/components/forms/SearchBox/SearchBox.tsx
+++ b/browser/data-browser/src/components/forms/SearchBox/SearchBox.tsx
@@ -6,7 +6,7 @@ import {
   useRef,
   useState,
 } from 'react';
-import { styled } from 'styled-components';
+import { css, styled } from 'styled-components';
 import { removeCachedSearchResults, useResource, useStore } from '@tomic/react';
 import { DropdownPortalContext } from '../../Dropdown/dropdownContext';
 import * as RadixPopover from '@radix-ui/react-popover';
@@ -163,6 +163,7 @@ export function SearchBox({
         <TriggerButtonWrapper
           disabled={!!disabled}
           className={className}
+          open={open}
           invalid={!!visualError}
         >
           {prefix}
@@ -259,10 +260,14 @@ const TriggerButton = styled.button<{ $empty: boolean }>`
 const TriggerButtonWrapper = styled.div<{
   invalid: boolean;
   disabled: boolean;
+  open: boolean;
 }>`
   ${SB_HIGHLIGHT.define(p =>
     p.invalid ? p.theme.colors.alert : p.theme.colors.main,
   )}
+
+  max-width: 100cqw;
+
   display: flex;
   position: relative;
   border: 1px solid ${props => props.theme.colors.bg2};
@@ -284,7 +289,11 @@ const TriggerButtonWrapper = styled.div<{
   &:focus-visible {
     border-color: transparent;
     box-shadow: 0 0 0 2px ${SB_HIGHLIGHT.var()};
-    z-index: 1000;
+    ${p =>
+      !p.open &&
+      css`
+        z-index: 1000;
+      `}
   }
 `;
 
diff --git a/browser/data-browser/src/helpers/containers.ts b/browser/data-browser/src/helpers/containers.ts
index fb047a7d9..9eebd1706 100644
--- a/browser/data-browser/src/helpers/containers.ts
+++ b/browser/data-browser/src/helpers/containers.ts
@@ -1,3 +1,5 @@
 export const MAIN_CONTAINER = 'main';
 export const ALL_PROPS_CONTAINER = 'all-props';
 export const CARD_CONTAINER = 'card';
+export const LAYOUT_CONTAINER = 'layout-container';
+export const DIALOG_CONTENT_CONTAINER = 'dialog-content';
diff --git a/browser/data-browser/src/hooks/useFile.ts b/browser/data-browser/src/hooks/useFile.ts
index a3b891a93..57bbf88a8 100644
--- a/browser/data-browser/src/hooks/useFile.ts
+++ b/browser/data-browser/src/hooks/useFile.ts
@@ -1,20 +1,18 @@
-import { properties, Resource, useNumber, useString } from '@tomic/react';
+import { Resource, server, useNumber, useString } from '@tomic/react';
 import { useCallback } from 'react';
 
 export function useFileInfo(resource: Resource) {
-  const [downloadUrl] = useString(resource, properties.file.downloadUrl);
-  const [mimeType] = useString(resource, properties.file.mimetype);
-
-  const [bytes] = useNumber(resource, properties.file.filesize);
+  const [downloadUrl] = useString(resource, server.properties.downloadUrl);
+  const [mimeType] = useString(resource, server.properties.mimetype);
+  const [bytes] = useNumber(resource, server.properties.filesize);
 
   const downloadFile = useCallback(() => {
     window.open(downloadUrl);
   }, [downloadUrl]);
 
   if (
-    downloadUrl === undefined ||
-    mimeType === undefined ||
-    bytes === undefined
+    !resource.loading &&
+    (downloadUrl === undefined || mimeType === undefined || bytes === undefined)
   ) {
     throw new Error('File resource is missing properties');
   }
diff --git a/browser/data-browser/src/styling.tsx b/browser/data-browser/src/styling.tsx
index 95368113b..6b1e01ce6 100644
--- a/browser/data-browser/src/styling.tsx
+++ b/browser/data-browser/src/styling.tsx
@@ -263,6 +263,9 @@ export const GlobalStyle = createGlobalStyle`
     line-height: 1.5em;
     word-wrap: break-word;
     overflow-wrap: anywhere;
+    // Prevents weird scrollbars appearing for a split second when opening a dialog
+    overflow: hidden;
+
     margin: 0;
     /** Pretty dark mode transition */
     transition: background-color .2s ease, border-color .2s ease, color .2s ease;
diff --git a/browser/react/src/hooks.ts b/browser/react/src/hooks.ts
index c409665f6..3b5599a4f 100644
--- a/browser/react/src/hooks.ts
+++ b/browser/react/src/hooks.ts
@@ -13,7 +13,6 @@ import {
   Resource,
   Datatype,
   datatypeFromUrl,
-  urls,
   truncateUrl,
   JSONValue,
   valToBoolean,
@@ -28,6 +27,8 @@ import {
   proxyResource,
   type Core,
   ResourceEvents,
+  core,
+  server,
 } from '@tomic/lib';
 import { useDebouncedCallback } from './index.js';
 
@@ -216,6 +217,7 @@ export function useValue(
     commitDebounce = 100,
     handleValidationError,
   } = opts;
+
   const [val, set] = useState<JSONValue>(resource.get(propertyURL));
   const [prevResourceReference, setPrevResourceReference] = useState(resource);
 
@@ -267,24 +269,30 @@ export function useValue(
     [resource, handleValidationError, store, validate, saveResource],
   );
 
+  useEffect(() => {
+    return resource.on(ResourceEvents.LocalChange, (prop, value) => {
+      if (prop === propertyURL) {
+        set(value);
+      }
+    });
+  }, [resource, propertyURL]);
+
   // Update value when resource changes.
   if (resource !== prevResourceReference) {
+    let localVal: JSONValue | undefined;
+
     try {
-      set(resource.get(propertyURL));
+      localVal = resource.get(propertyURL);
+      set(localVal);
     } catch (e) {
       store.notifyError(e);
     }
 
     setPrevResourceReference(resource);
-  }
 
-  useEffect(() => {
-    return resource.on(ResourceEvents.LocalChange, (prop, value) => {
-      if (prop === propertyURL) {
-        set(value);
-      }
-    });
-  }, [resource, propertyURL]);
+    // We changed the value but we don't want to wait a whole react cycle to return the new value so we return the value here directly.
+    return [localVal, validateAndSet];
+  }
 
   return [val, validateAndSet];
 }
@@ -351,15 +359,15 @@ export function useTitle(
   truncateLength = 40,
   opts: useValueOptions = titleHookOpts,
 ): [string, SetValue<string>] {
-  const [name, setName] = useString(resource, urls.properties.name, opts);
+  const [name, setName] = useString(resource, core.properties.name, opts);
   const [shortname, setShortname] = useString(
     resource,
-    urls.properties.shortname,
+    core.properties.shortname,
     opts,
   );
   const [filename, setFileName] = useString(
     resource,
-    urls.properties.file.filename,
+    server.properties.filename,
     opts,
   );
 
@@ -379,7 +387,7 @@ export function useTitle(
     return [filename, setFileName];
   }
 
-  const subject = resource?.getSubject();
+  const subject = resource?.subject;
 
   if (typeof subject === 'string' && subject.length > 0) {
     return [truncateUrl(subject, truncateLength), setName];