diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
index ec3f17918..b4ced4d06 100644
--- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
+++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
@@ -8,7 +8,7 @@ import { FunctionComponent } from 'preact'
 import { useCallback, useEffect, useRef, useState } from 'preact/hooks'
 import { Icon } from '@/Components/Icon'
 import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur'
-import { ChallengeReason, ContentType, SNFile } from '@standardnotes/snjs'
+import { ChallengeReason, CollectionSort, ContentType, SNFile } from '@standardnotes/snjs'
 import { confirmDialog } from '@/Services/AlertService'
 import { addToast, dismissToast, ToastType } from '@standardnotes/stylekit'
 import { StreamingFileReader } from '@standardnotes/filepicker'
@@ -39,8 +39,7 @@ const removeDragOverlay = () => {
 }
 
 const isHandlingFileDrag = (event: DragEvent) =>
-  event.dataTransfer?.items &&
-  Array.from(event.dataTransfer.items).some((item) => item.kind === 'file')
+  event.dataTransfer?.items && Array.from(event.dataTransfer.items).some((item) => item.kind === 'file')
 
 export const AttachedFilesButton: FunctionComponent<Props> = observer(
   ({ application, appState, onClickPreprocessing }) => {
@@ -66,17 +65,11 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
     const attachedFilesCount = attachedFiles.length
 
     useEffect(() => {
+      application.items.setDisplayOptions(ContentType.File, CollectionSort.Title, 'dsc')
+
       const unregisterFileStream = application.streamItems(ContentType.File, () => {
-        setAllFiles(
-          application.items
-            .getItems<SNFile>(ContentType.File)
-            .sort((a, b) => (a.created_at < b.created_at ? 1 : -1)),
-        )
-        setAttachedFiles(
-          application.items
-            .getFilesForNote(note)
-            .sort((a, b) => (a.created_at < b.created_at ? 1 : -1)),
-        )
+        setAllFiles(application.items.getDisplayableItems<SNFile>(ContentType.File))
+        setAttachedFiles(application.items.getFilesForNote(note))
       })
 
       return () => {
@@ -162,14 +155,8 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
       return isProtected
     }
 
-    const authorizeProtectedActionForFile = async (
-      file: SNFile,
-      challengeReason: ChallengeReason,
-    ) => {
-      const authorizedFiles = await application.protections.authorizeProtectedActionForFiles(
-        [file],
-        challengeReason,
-      )
+    const authorizeProtectedActionForFile = async (file: SNFile, challengeReason: ChallengeReason) => {
+      const authorizedFiles = await application.protections.authorizeProtectedActionForFiles([file], challengeReason)
       const isAuthorized = authorizedFiles.length > 0 && authorizedFiles.includes(file)
       return isAuthorized
     }
@@ -179,16 +166,12 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
     }
 
     const handleFileAction = async (action: PopoverFileItemAction) => {
-      const file =
-        action.type !== PopoverFileItemActionType.RenameFile ? action.payload : action.payload.file
+      const file = action.type !== PopoverFileItemActionType.RenameFile ? action.payload : action.payload.file
       let isAuthorizedForAction = true
 
       if (file.protected && action.type !== PopoverFileItemActionType.ToggleFileProtection) {
         keepMenuOpen(true)
-        isAuthorizedForAction = await authorizeProtectedActionForFile(
-          file,
-          ChallengeReason.AccessProtectedFile,
-        )
+        isAuthorizedForAction = await authorizeProtectedActionForFile(file, ChallengeReason.AccessProtectedFile)
         keepMenuOpen(false)
         buttonRef.current?.focus()
       }
@@ -219,10 +202,7 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
           await renameFile(file, action.payload.name)
           break
         case PopoverFileItemActionType.PreviewFile:
-          filePreviewModal.activate(
-            file,
-            currentTab === PopoverTabs.AllFiles ? allFiles : attachedFiles,
-          )
+          filePreviewModal.activate(file, currentTab === PopoverTabs.AllFiles ? allFiles : attachedFiles)
           break
       }
 
@@ -353,9 +333,7 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
               }
             }}
             ref={buttonRef}
-            className={`sn-icon-button border-contrast ${
-              attachedFilesCount > 0 ? 'py-1 px-3' : ''
-            }`}
+            className={`sn-icon-button border-contrast ${attachedFilesCount > 0 ? 'py-1 px-3' : ''}`}
             onBlur={closeOnBlur}
           >
             <VisuallyHidden>Attached files</VisuallyHidden>
diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
index d5e9d9bed..15221a5ad 100644
--- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
+++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
@@ -47,9 +47,7 @@ export const AttachedFilesPopover: FunctionComponent<Props> = observer(
 
     const filteredList =
       searchQuery.length > 0
-        ? filesList.filter(
-            (file) => file.name.toLowerCase().indexOf(searchQuery.toLowerCase()) !== -1,
-          )
+        ? filesList.filter((file) => file.name.toLowerCase().indexOf(searchQuery.toLowerCase()) !== -1)
         : filesList
 
     const handleAttachFilesClick = async () => {
@@ -78,9 +76,7 @@ export const AttachedFilesPopover: FunctionComponent<Props> = observer(
         <div className="flex border-0 border-b-1 border-solid border-main">
           <button
             className={`bg-default border-0 cursor-pointer px-3 py-2.5 relative focus:bg-info-backdrop focus:shadow-bottom ${
-              currentTab === PopoverTabs.AttachedFiles
-                ? 'color-info font-medium shadow-bottom'
-                : 'color-text'
+              currentTab === PopoverTabs.AttachedFiles ? 'color-info font-medium shadow-bottom' : 'color-text'
             }`}
             onClick={() => {
               setCurrentTab(PopoverTabs.AttachedFiles)
@@ -91,9 +87,7 @@ export const AttachedFilesPopover: FunctionComponent<Props> = observer(
           </button>
           <button
             className={`bg-default border-0 cursor-pointer px-3 py-2.5 relative focus:bg-info-backdrop focus:shadow-bottom ${
-              currentTab === PopoverTabs.AllFiles
-                ? 'color-info font-medium shadow-bottom'
-                : 'color-text'
+              currentTab === PopoverTabs.AllFiles ? 'color-info font-medium shadow-bottom' : 'color-text'
             }`}
             onClick={() => {
               setCurrentTab(PopoverTabs.AllFiles)
diff --git a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
index 13ee22c4c..18abf9dd6 100644
--- a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
+++ b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
@@ -22,12 +22,7 @@ type Props = {
   onDismiss: () => void
 }
 
-export const FilePreviewModal: FunctionComponent<Props> = ({
-  application,
-  files,
-  file,
-  onDismiss,
-}) => {
+export const FilePreviewModal: FunctionComponent<Props> = ({ application, files, file, onDismiss }) => {
   const context = useFilePreviewModal()
 
   const [objectUrl, setObjectUrl] = useState<string>()
@@ -94,8 +89,7 @@ export const FilePreviewModal: FunctionComponent<Props> = ({
 
     switch (event.key) {
       case KeyboardKey.Left: {
-        const previousFileIndex =
-          currentFileIndex - 1 >= 0 ? currentFileIndex - 1 : files.length - 1
+        const previousFileIndex = currentFileIndex - 1 >= 0 ? currentFileIndex - 1 : files.length - 1
         const previousFile = files[previousFileIndex]
         if (previousFile) {
           context.setCurrentFile(previousFile)
@@ -184,8 +178,8 @@ export const FilePreviewModal: FunctionComponent<Props> = ({
                 {isFilePreviewable ? (
                   <>
                     <div className="text-sm text-center color-grey-0 mb-4 max-w-35ch">
-                      There was an error loading the file. Try again, or download the file and open
-                      it using another application.
+                      There was an error loading the file. Try again, or download the file and open it using another
+                      application.
                     </div>
                     <div className="flex items-center">
                       <Button
diff --git a/app/assets/javascripts/Components/Files/FilePreviewModalProvider.tsx b/app/assets/javascripts/Components/Files/FilePreviewModalProvider.tsx
index 758c2b629..92760bdb0 100644
--- a/app/assets/javascripts/Components/Files/FilePreviewModalProvider.tsx
+++ b/app/assets/javascripts/Components/Files/FilePreviewModalProvider.tsx
@@ -44,12 +44,7 @@ export const FilePreviewModalProvider: FunctionComponent<{
     <>
       <FilePreviewModalContext.Provider value={{ activate, setCurrentFile }}>
         {isOpen && currentFile && (
-          <FilePreviewModal
-            application={application}
-            files={files}
-            file={currentFile}
-            onDismiss={close}
-          />
+          <FilePreviewModal application={application} files={files} file={currentFile} onDismiss={close} />
         )}
         {children}
       </FilePreviewModalContext.Provider>
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx
index 74b7ccd6d..0f9f8fefe 100644
--- a/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx
+++ b/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx
@@ -25,9 +25,7 @@ export const AccountPreferences = observer(({ application, appState }: Props) =>
       </>
     )}
     <Subscription application={application} appState={appState} />
-    {application.hasAccount() && appState.features.isEntitledToFiles && (
-      <FilesSection application={application} />
-    )}
+    {application.hasAccount() && appState.features.isEntitledToFiles && <FilesSection application={application} />}
     <SignOutWrapper application={application} appState={appState} />
   </PreferencesPane>
 ))
diff --git a/app/assets/javascripts/Device/DesktopDeviceInterface.ts b/app/assets/javascripts/Device/DesktopDeviceInterface.ts
index 7d57d2d80..c36d12952 100644
--- a/app/assets/javascripts/Device/DesktopDeviceInterface.ts
+++ b/app/assets/javascripts/Device/DesktopDeviceInterface.ts
@@ -6,8 +6,6 @@ export function isDesktopDevice(x: DeviceInterface): x is DesktopDeviceInterface
   return x.environment === Environment.Desktop
 }
 
-export interface DesktopDeviceInterface
-  extends WebOrDesktopDeviceInterface,
-    WebClientRequiresDesktopMethods {
+export interface DesktopDeviceInterface extends WebOrDesktopDeviceInterface, WebClientRequiresDesktopMethods {
   environment: Environment.Desktop
 }
diff --git a/app/assets/javascripts/Device/DesktopWebCommunication.ts b/app/assets/javascripts/Device/DesktopWebCommunication.ts
index b9bc74ddd..47e17af72 100644
--- a/app/assets/javascripts/Device/DesktopWebCommunication.ts
+++ b/app/assets/javascripts/Device/DesktopWebCommunication.ts
@@ -32,10 +32,7 @@ export interface DesktopClientRequiresWebMethods {
 
   windowLostFocus(): void
 
-  onComponentInstallationComplete(
-    componentData: DecryptedTransferPayload,
-    error: unknown,
-  ): Promise<void>
+  onComponentInstallationComplete(componentData: DecryptedTransferPayload, error: unknown): Promise<void>
 
   requestBackupFile(): Promise<string | undefined>
 
diff --git a/app/assets/javascripts/Services/DesktopManager.ts b/app/assets/javascripts/Services/DesktopManager.ts
index 5bc052b25..ecdf84855 100644
--- a/app/assets/javascripts/Services/DesktopManager.ts
+++ b/app/assets/javascripts/Services/DesktopManager.ts
@@ -113,10 +113,7 @@ export class DesktopManager
     this.webApplication.notifyWebEvent(WebAppEvent.DesktopWindowLostFocus)
   }
 
-  async onComponentInstallationComplete(
-    componentData: DecryptedTransferPayload<ComponentContent>,
-    error: unknown,
-  ) {
+  async onComponentInstallationComplete(componentData: DecryptedTransferPayload<ComponentContent>, error: unknown) {
     const component = this.application.items.findItem(componentData.uuid)
     if (!component) {
       return
diff --git a/app/assets/javascripts/Services/IOService.ts b/app/assets/javascripts/Services/IOService.ts
index f976f672b..9ee0660ba 100644
--- a/app/assets/javascripts/Services/IOService.ts
+++ b/app/assets/javascripts/Services/IOService.ts
@@ -129,14 +129,10 @@ export class IOService {
       // For a modifier like ctrlKey, must check both event.ctrlKey and event.key.
       // That's because on keyup, event.ctrlKey would be false, but event.key == Control would be true.
       const matches =
-        ((event.ctrlKey || event.key === KeyboardModifier.Ctrl) &&
-          modifier === KeyboardModifier.Ctrl) ||
-        ((event.metaKey || event.key === KeyboardModifier.Meta) &&
-          modifier === KeyboardModifier.Meta) ||
-        ((event.altKey || event.key === KeyboardModifier.Alt) &&
-          modifier === KeyboardModifier.Alt) ||
-        ((event.shiftKey || event.key === KeyboardModifier.Shift) &&
-          modifier === KeyboardModifier.Shift)
+        ((event.ctrlKey || event.key === KeyboardModifier.Ctrl) && modifier === KeyboardModifier.Ctrl) ||
+        ((event.metaKey || event.key === KeyboardModifier.Meta) && modifier === KeyboardModifier.Meta) ||
+        ((event.altKey || event.key === KeyboardModifier.Alt) && modifier === KeyboardModifier.Alt) ||
+        ((event.shiftKey || event.key === KeyboardModifier.Shift) && modifier === KeyboardModifier.Shift)
 
       return matches
     })
@@ -190,10 +186,7 @@ export class IOService {
         continue
       }
 
-      if (
-        observer.key &&
-        this.eventMatchesKeyAndModifiers(event, observer.key, observer.modifiers)
-      ) {
+      if (observer.key && this.eventMatchesKeyAndModifiers(event, observer.key, observer.modifiers)) {
         const callback = keyEvent === KeyboardKeyEvent.Down ? observer.onKeyDown : observer.onKeyUp
         if (callback) {
           callback(event)
diff --git a/package.json b/package.json
index 07ec8d827..cd9754b50 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "@standardnotes/components": "1.7.15",
     "@standardnotes/filepicker": "1.13.3",
     "@standardnotes/sncrypto-web": "1.8.4",
-    "@standardnotes/snjs": "2.102.0",
+    "@standardnotes/snjs": "2.103.0",
     "@standardnotes/stylekit": "5.23.0",
     "@zip.js/zip.js": "^2.4.10",
     "mobx": "^6.5.0",
diff --git a/yarn.lock b/yarn.lock
index 8a94953f1..778c5c69b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2458,14 +2458,14 @@
     "@standardnotes/auth" "^3.18.11"
     "@standardnotes/features" "^1.38.1"
 
-"@standardnotes/encryption@^1.4.12":
-  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.4.12.tgz#098c9320a7b19aba44e0c7baa1fcd243120c2fef"
-  integrity sha512-DTW/CAlDDOimXwE8XN+V2R3sPXXQYzYnWZHs6WCD3NaLN41MAoG1j8cVuTKHHMP0hhaS2/refOllgt8Kf97mKQ==
+"@standardnotes/encryption@^1.4.13":
+  version "1.4.13"
+  resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.4.13.tgz#056880bd82f2dcb5ca6bb2e38650b1f6004db35c"
+  integrity sha512-0AXjs15UKKjTEIyZTzTqny5yd/5lVGxZOtxAkO8/z8Qx1lK/J3KTUlWz2h0JBsRyA4PaTyLSNVKoF51mE8Bd1w==
   dependencies:
-    "@standardnotes/models" "^1.5.1"
+    "@standardnotes/models" "^1.6.0"
     "@standardnotes/responses" "^1.6.12"
-    "@standardnotes/services" "^1.9.13"
+    "@standardnotes/services" "^1.9.14"
 
 "@standardnotes/features@^1.38.1":
   version "1.38.1"
@@ -2483,10 +2483,10 @@
     "@standardnotes/common" "^1.19.6"
     "@standardnotes/utils" "^1.6.2"
 
-"@standardnotes/models@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@standardnotes/models/-/models-1.5.1.tgz#a522c715c74c63e58fc4182e69baad46548dbfba"
-  integrity sha512-dOVnT5HCAjU3i4KqTeu05h5d+LDp8nteam6xb9V75XbA/UT9TMC3zwE+yEYpvWC4iKSbdPQvIuuvp8hXFyOnbA==
+"@standardnotes/models@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@standardnotes/models/-/models-1.6.0.tgz#63cab950b2e533bbe3feab1fad8deddc51c66ae9"
+  integrity sha512-tO7YpRQXHsJkF06BNxOwI89Rhk5G3thkcfv6/dKaxG274F91XYBzoFGaRvs3EczEKDfqkOyb1H7wM02T8LXIvw==
   dependencies:
     "@standardnotes/features" "^1.38.1"
     "@standardnotes/responses" "^1.6.12"
@@ -2501,13 +2501,13 @@
     "@standardnotes/common" "^1.19.6"
     "@standardnotes/features" "^1.38.1"
 
-"@standardnotes/services@^1.9.13":
-  version "1.9.13"
-  resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.9.13.tgz#4af36863626cd70be976785f85dc76cb3fd8f3d8"
-  integrity sha512-UWrg8ThBUl3JvLRFc3tEPXstJFQtnLAVHOfRppUL8MZZ+U6sYmKRpQp9+pX0Wdx0SQwQuuRyFKtSw9JFlLvrnA==
+"@standardnotes/services@^1.9.14":
+  version "1.9.14"
+  resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.9.14.tgz#6bc692ce58c2db3573474c7efd44b3586a59d52e"
+  integrity sha512-9Z62AP+zcOpmQfRiOFYUZnYIsHgTVsV6x3DcvE800xvBkQkHbkx5VeeDzV9r06iJzIl4f2BGvss3rjj3PC/R3Q==
   dependencies:
     "@standardnotes/common" "^1.19.6"
-    "@standardnotes/models" "^1.5.1"
+    "@standardnotes/models" "^1.6.0"
     "@standardnotes/responses" "^1.6.12"
     "@standardnotes/utils" "^1.6.2"
 
@@ -2530,20 +2530,20 @@
     buffer "^6.0.3"
     libsodium-wrappers "^0.7.9"
 
-"@standardnotes/snjs@2.102.0":
-  version "2.102.0"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.102.0.tgz#756ad160395c87d791399d0d2784ae9b2853d07e"
-  integrity sha512-+cPyYW6MUex1D8MeX0hrDzKywnuGZj8le7varDbhs3zT++f7UWt6pmu7SEXx71A75rP5u5oDtdaOxqSyBNHOlg==
+"@standardnotes/snjs@2.103.0":
+  version "2.103.0"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.103.0.tgz#708d39780b685b9e27478cb70900d71e89d6ec57"
+  integrity sha512-ak89W+ShM2kNxlW+eMA86AgjGGMUkyy+4zOa5G0KWdQJEHcevFnLVyn4ZPhvywxJWAnNZi0gGEQFuLd5IunyLQ==
   dependencies:
     "@standardnotes/auth" "^3.18.11"
     "@standardnotes/common" "^1.19.6"
     "@standardnotes/domain-events" "^2.27.12"
-    "@standardnotes/encryption" "^1.4.12"
+    "@standardnotes/encryption" "^1.4.13"
     "@standardnotes/features" "^1.38.1"
     "@standardnotes/filepicker" "^1.13.3"
-    "@standardnotes/models" "^1.5.1"
+    "@standardnotes/models" "^1.6.0"
     "@standardnotes/responses" "^1.6.12"
-    "@standardnotes/services" "^1.9.13"
+    "@standardnotes/services" "^1.9.14"
     "@standardnotes/settings" "^1.14.1"
     "@standardnotes/sncrypto-common" "^1.7.7"
     "@standardnotes/utils" "^1.6.2"