diff --git a/src/prompt/tooltip.go b/src/prompt/tooltip.go
index 45ea01343387..3eba86a42ebd 100644
--- a/src/prompt/tooltip.go
+++ b/src/prompt/tooltip.go
@@ -57,9 +57,8 @@ func (e *Engine) Tooltip(tip string) string {
 	switch e.Env.Shell() {
 	case shell.PWSH, shell.PWSH5:
 		e.rprompt = text
-		e.rpromptLength = length
 		e.currentLineLength = e.Env.Flags().Column
-		space, ok := e.canWriteRightBlock(true)
+		space, ok := e.canWriteRightBlock(length, true)
 		if !ok {
 			return ""
 		}
diff --git a/website/docs/faq.mdx b/website/docs/faq.mdx
index 35d256871994..9ecf46c8ac9e 100644
--- a/website/docs/faq.mdx
+++ b/website/docs/faq.mdx
@@ -275,10 +275,6 @@ setopt appendhistory
 
 This is most likely caused by two Oh My Posh init lines in your `.zshrc`, remove one of them. See [here][zsh-init].
 
-### Fish: $(...) is not supported
-
-You should update fish to v3.4.0 or higher. Fish supports `$(...)` and `"$(...)"` since v3.4.0, as described in its [changelog][fish-changelog].
-
 ### Fish: Display current bind (Vim) mode
 
 Use the `set_poshcontext` function to export the current mode. Note that scope shadowing must be disabled in order to
diff --git a/website/docs/installation/customize.mdx b/website/docs/installation/customize.mdx
index c489c8a0f802..2d0c6ca21723 100644
--- a/website/docs/installation/customize.mdx
+++ b/website/docs/installation/customize.mdx
@@ -138,7 +138,7 @@ exec elvish
 <TabItem value="fish">
 
 :::caution
-Oh My Posh requires fish v3.4.0 or higher.
+It is recommended to use the latest version of Fish. Versions below 3.1.2 have issues displaying the prompt.
 :::
 
 Adjust the Oh My Posh init line in `~/.config/fish/config.fish` by adding the `--config` flag with
diff --git a/website/docs/installation/prompt.mdx b/website/docs/installation/prompt.mdx
index 986bf3a3dbfa..4c2e1e6e5f45 100644
--- a/website/docs/installation/prompt.mdx
+++ b/website/docs/installation/prompt.mdx
@@ -85,7 +85,7 @@ exec elvish
 <TabItem value="fish">
 
 :::caution
-Oh My Posh requires fish v3.4.0 or higher.
+It is recommended to use the latest version of Fish. Versions below 3.1.2 have issues displaying the prompt.
 :::
 
 Initialize Oh My Posh in `~/.config/fish/config.fish`: