diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
index de677a5f1b..d314c9ecd2 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
@@ -442,13 +442,15 @@ const CodeMirrorSearchForm: FC<React.PropsWithChildren> = () => {
 
           <FullProjectSearchButton query={query} />
 
-          {position !== null && (
-            <div className="ol-cm-search-form-position">
-              {position.current === null ? '?' : position.current} {t('of')}{' '}
-              {position.total}
-              {position.interrupted && '+'}
-            </div>
-          )}
+          <div className="ol-cm-search-form-position">
+            {position !== null && (
+              <>
+                {position.current === null ? '?' : position.current} {t('of')}{' '}
+                {position.total}
+                {position.interrupted && '+'}
+              </>
+            )}
+          </div>
         </div>
 
         {showReplace && (
diff --git a/services/web/frontend/js/features/source-editor/extensions/search.ts b/services/web/frontend/js/features/source-editor/extensions/search.ts
index 378cad2e26..81c29d53af 100644
--- a/services/web/frontend/js/features/source-editor/extensions/search.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/search.ts
@@ -407,6 +407,7 @@ const searchFormTheme = EditorView.theme({
   '.ol-cm-search-form-position': {
     flexShrink: 0,
     color: 'var(--content-secondary)',
+    minWidth: '5em',
   },
   '.ol-cm-search-hidden-inputs': {
     position: 'absolute',