diff --git a/pkg/scraper/freeones.go b/pkg/scraper/freeones.go
index 66db306b1..d1193048f 100644
--- a/pkg/scraper/freeones.go
+++ b/pkg/scraper/freeones.go
@@ -46,7 +46,7 @@ xPathScrapers:
               - regex: \sBio\s*$
                 with: ""
       URL: //link[@rel="alternate" and @hreflang="x-default"]/@href
-      Twitter: //a[contains(@href,'twitter.com/')]/@href
+      Twitter: //a[not(starts-with(@href,'https://twitter.com/FreeOnes'))][contains(@href,'twitter.com/')]/@href 
       Instagram: //a[contains(@href,'instagram.com/')]/@href
       Birthdate:
         selector: //span[contains(text(),'Born On')]
diff --git a/ui/v2.5/src/components/Changelog/versions/v0110.md b/ui/v2.5/src/components/Changelog/versions/v0110.md
index e99faa25a..180c85d9f 100644
--- a/ui/v2.5/src/components/Changelog/versions/v0110.md
+++ b/ui/v2.5/src/components/Changelog/versions/v0110.md
@@ -7,6 +7,7 @@
 * Optimised scanning process. ([#1816](https://github.com/stashapp/stash/pull/1816))
 
 ### 🐛 Bug fixes
+* Fix Twitter value defaulting to freeones in built-in Freeones scraper. ([#1853](https://github.com/stashapp/stash/pull/1853))
 * Fix colour codes not outputting correctly when logging to file on Windows. ([#1846](https://github.com/stashapp/stash/pull/1846))
 * Sort directory listings using case sensitive collation. ([#1823](https://github.com/stashapp/stash/pull/1823))
 * Fix auto-tag logic for names which have single-letter words. ([#1817](https://github.com/stashapp/stash/pull/1817))
diff --git a/ui/v2.5/src/components/List/ListFilter.tsx b/ui/v2.5/src/components/List/ListFilter.tsx
index 1adaa37fb..41bd5e15a 100644
--- a/ui/v2.5/src/components/List/ListFilter.tsx
+++ b/ui/v2.5/src/components/List/ListFilter.tsx
@@ -240,11 +240,13 @@ export const ListFilter: React.FC<IListFilterProps> = ({
         </div>
 
         <Dropdown as={ButtonGroup} className="mr-2 mb-1">
-          <Dropdown.Toggle variant="secondary">
-            {currentSortBy
-              ? intl.formatMessage({ id: currentSortBy.messageID })
-              : ""}
-          </Dropdown.Toggle>
+          <InputGroup.Prepend>
+            <Dropdown.Toggle variant="secondary">
+              {currentSortBy
+                ? intl.formatMessage({ id: currentSortBy.messageID })
+                : ""}
+            </Dropdown.Toggle>
+          </InputGroup.Prepend>
           <Dropdown.Menu className="bg-secondary text-white">
             {renderSortByOptions()}
           </Dropdown.Menu>
diff --git a/ui/v2.5/src/components/Shared/styles.scss b/ui/v2.5/src/components/Shared/styles.scss
index 2c16e3ff7..f814a7458 100644
--- a/ui/v2.5/src/components/Shared/styles.scss
+++ b/ui/v2.5/src/components/Shared/styles.scss
@@ -208,3 +208,10 @@ button.collapse-button.btn-primary:not(:disabled):not(.disabled):active {
     }
   }
 }
+
+.input-group-prepend {
+  .btn {
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+  }
+}