diff --git a/Rectangle/AccessibilityElement.swift b/Rectangle/AccessibilityElement.swift
index e0878769f..864a52fd9 100644
--- a/Rectangle/AccessibilityElement.swift
+++ b/Rectangle/AccessibilityElement.swift
@@ -138,7 +138,7 @@ class AccessibilityElement {
         return childElements?.filter { $0.role == role }
     }
     
-    fileprivate var windowId: CGWindowID? {
+    var windowId: CGWindowID? {
         wrappedElement.getWindowId()
     }
 
@@ -193,7 +193,7 @@ class AccessibilityElement {
         applicationElement?.getElementValue(.focusedWindow)
     }
     
-    private var windowElements: [AccessibilityElement]? {
+    var windowElements: [AccessibilityElement]? {
         applicationElement?.getElementsValue(.windows)
     }
     
@@ -292,11 +292,6 @@ extension AccessibilityElement {
         return nil
     }
     
-    static func getTodoWindowElement() -> AccessibilityElement? {
-        guard let bundleIdentifier = Defaults.todoApplication.value else { return nil }
-        return AccessibilityElement(bundleIdentifier)?.windowElements?.first
-    }
-    
     static func getWindowElement(_ windowId: CGWindowID) -> AccessibilityElement? {
         guard let pid = WindowUtil.getWindowList([windowId]).first?.pid else { return nil }
         return AccessibilityElement(pid).windowElements?.first { $0.windowId == windowId }
@@ -322,7 +317,7 @@ class StageWindowAccessibilityElement: AccessibilityElement {
         return .init(origin: info.frame.origin, size: frame.size)
     }
     
-    override fileprivate var windowId: CGWindowID? {
+    override var windowId: CGWindowID? {
         _windowId
     }
 }
diff --git a/Rectangle/AppDelegate.swift b/Rectangle/AppDelegate.swift
index 19bc273ee..09786de26 100644
--- a/Rectangle/AppDelegate.swift
+++ b/Rectangle/AppDelegate.swift
@@ -398,12 +398,9 @@ extension AppDelegate: NSMenuDelegate {
 extension AppDelegate {
     func initializeTodo(_ bringToFront: Bool = true) {
         self.showHideTodoMenuItems()
-        guard Defaults.todo.userEnabled else { return }
-        TodoManager.registerToggleShortcut()
-        TodoManager.registerReflowShortcut()
-        if Defaults.todoMode.enabled {
-            TodoManager.moveAll(bringToFront)
-        }
+        TodoManager.registerUnregisterToggleShortcut()
+        TodoManager.registerUnregisterReflowShortcut()
+        TodoManager.moveAllIfNeeded(bringToFront)
     }
 
     enum TodoItem {
@@ -459,19 +456,13 @@ extension AppDelegate {
     }
 
     @objc func toggleTodoMode(_ sender: NSMenuItem) {
-        if sender.state == .off {
-            Defaults.todoMode.enabled = true
-            TodoManager.moveAll()
-        } else {
-            Defaults.todoMode.enabled = false
-        }
+        let enabled = sender.state == .off
+        TodoManager.setTodoMode(enabled)
     }
 
     @objc func setTodoApp(_ sender: NSMenuItem) {
         applicationToggle.setTodoApp()
-        if Defaults.todoMode.enabled {
-            TodoManager.moveAll()
-        }
+        TodoManager.moveAllIfNeeded()
     }
 
     @objc func todoReflow(_ sender: NSMenuItem) {
diff --git a/Rectangle/Base.lproj/Main.storyboard b/Rectangle/Base.lproj/Main.storyboard
index 0ef5fd30a..ae391f350 100644
--- a/Rectangle/Base.lproj/Main.storyboard
+++ b/Rectangle/Base.lproj/Main.storyboard
@@ -2568,15 +2568,15 @@
         <scene sceneID="tRx-9g-sUa">
             <objects>
                 <viewController storyboardIdentifier="SettingsViewController" id="yhc-gS-h02" customClass="SettingsViewController" customModule="Rectangle" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" id="mTk-eQ-4uf">
-                        <rect key="frame" x="0.0" y="0.0" width="490" height="588"/>
+                    <view key="view" misplaced="YES" id="mTk-eQ-4uf">
+                        <rect key="frame" x="0.0" y="0.0" width="490" height="598"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="10" horizontalStackHuggingPriority="1000" verticalStackHuggingPriority="1000" verticalCompressionResistancePriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tUi-Ja-evb">
-                                <rect key="frame" x="20" y="20" width="450" height="548"/>
+                                <rect key="frame" x="20" y="20" width="450" height="544"/>
                                 <subviews>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7ew-iJ-cZQ">
-                                        <rect key="frame" x="0.0" y="532" width="450" height="16"/>
+                                        <rect key="frame" x="0.0" y="528" width="450" height="16"/>
                                         <subviews>
                                             <button verticalHuggingPriority="749" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eQJ-O3-a8H">
                                                 <rect key="frame" x="-2" y="-1" width="396" height="18"/>
@@ -2613,7 +2613,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <button verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="wBT-R4-q9s">
-                                        <rect key="frame" x="-2" y="505" width="452" height="18"/>
+                                        <rect key="frame" x="-2" y="501" width="452" height="18"/>
                                         <buttonCell key="cell" type="check" title="Hide menu bar icon" bezelStyle="regularSquare" imagePosition="left" inset="2" id="qlg-kC-FMr">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -2623,7 +2623,7 @@
                                         </connections>
                                     </button>
                                     <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="gIp-Hu-6ns">
-                                        <rect key="frame" x="-2" y="482" width="454" height="14"/>
+                                        <rect key="frame" x="-2" y="478" width="454" height="14"/>
                                         <textFieldCell key="cell" title="When the menu bar icon is hidden, relaunch Rectangle from Finder to open" id="ltc-mf-BHr">
                                             <font key="font" metaFont="message" size="11"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -2631,7 +2631,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AmL-wm-e8w">
-                                        <rect key="frame" x="0.0" y="451" width="450" height="21"/>
+                                        <rect key="frame" x="0.0" y="447" width="450" height="21"/>
                                         <subviews>
                                             <button horizontalHuggingPriority="249" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="HcU-0y-wJU">
                                                 <rect key="frame" x="-2" y="2" width="298" height="18"/>
@@ -2664,13 +2664,13 @@
                                         </customSpacing>
                                     </stackView>
                                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ujo-nl-syC">
-                                        <rect key="frame" x="0.0" y="419" width="450" height="24"/>
+                                        <rect key="frame" x="0.0" y="415" width="450" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="HTM-FQ-j4S"/>
                                         </constraints>
                                     </box>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FFt-uh-04m">
-                                        <rect key="frame" x="0.0" y="391" width="450" height="20"/>
+                                        <rect key="frame" x="0.0" y="387" width="450" height="20"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="5An-8B-vsH">
                                                 <rect key="frame" x="-2" y="2" width="132" height="16"/>
@@ -2710,7 +2710,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xcu-aJ-4bm">
-                                        <rect key="frame" x="0.0" y="361" width="450" height="20"/>
+                                        <rect key="frame" x="0.0" y="357" width="450" height="20"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="WkQ-lb-VGR">
                                                 <rect key="frame" x="-2" y="4" width="147" height="16"/>
@@ -2748,7 +2748,7 @@
                                         </customSpacing>
                                     </stackView>
                                     <button verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="UY7-Nt-G3K">
-                                        <rect key="frame" x="-2" y="334" width="452" height="18"/>
+                                        <rect key="frame" x="-2" y="330" width="452" height="18"/>
                                         <buttonCell key="cell" type="check" title="Remove keyboard shortcut restrictions" bezelStyle="regularSquare" imagePosition="left" inset="2" id="n4U-FC-L9s">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -2758,7 +2758,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="WUS-pH-Rxv">
-                                        <rect key="frame" x="-2" y="308" width="452" height="18"/>
+                                        <rect key="frame" x="-2" y="304" width="452" height="18"/>
                                         <buttonCell key="cell" type="check" title="Move cursor along with window across displays" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Pbz-DF-hgG">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -2768,13 +2768,13 @@
                                         </connections>
                                     </button>
                                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="evn-f6-2bW">
-                                        <rect key="frame" x="0.0" y="277" width="450" height="24"/>
+                                        <rect key="frame" x="0.0" y="273" width="450" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="bBf-fp-7rI"/>
                                         </constraints>
                                     </box>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ipm-Bt-PDm">
-                                        <rect key="frame" x="0.0" y="253" width="450" height="16"/>
+                                        <rect key="frame" x="0.0" y="249" width="450" height="16"/>
                                         <subviews>
                                             <button horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="0PP-0x-QWc">
                                                 <rect key="frame" x="-2" y="-1" width="182" height="18"/>
@@ -2815,157 +2815,172 @@
                                         </customSpacing>
                                     </stackView>
                                     <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Q4P-mY-521">
-                                        <rect key="frame" x="-2" y="229" width="454" height="14"/>
+                                        <rect key="frame" x="-2" y="225" width="454" height="14"/>
                                         <textFieldCell key="cell" title="Keep a chosen application visible on the right of your primary screen at all times" id="FCh-1Q-Xms">
                                             <font key="font" metaFont="message" size="11"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ntf-YR-7Gr">
-                                        <rect key="frame" x="0.0" y="198" width="450" height="21"/>
+                                    <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lRr-k7-YZR">
+                                        <rect key="frame" x="0.0" y="140" width="450" height="75"/>
                                         <subviews>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="90f-Y4-sgi">
-                                                <rect key="frame" x="-2" y="3" width="98" height="16"/>
-                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Todo app width" id="6e0-ji-qXw">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <textField verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="9VW-Hc-lh2" customClass="AutoSaveFloatField" customModule="Rectangle" customModuleProvider="target">
-                                                <rect key="frame" x="102" y="0.0" width="100" height="21"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="A6q-mA-Xaq"/>
-                                                    <constraint firstAttribute="width" priority="250" constant="100" id="Ebz-nb-cys"/>
-                                                </constraints>
-                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="400" drawsBackground="YES" id="lUu-Hs-vuk">
-                                                    <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="O5b-ir-jyO"/>
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eTN-Lz-EDf">
-                                                <rect key="frame" x="208" y="3" width="105" height="16"/>
-                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="px" id="HVG-6v-eJH">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pon-Fc-IkL">
-                                                <rect key="frame" x="319" y="1" width="131" height="20"/>
+                                            <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ntf-YR-7Gr">
+                                                <rect key="frame" x="0.0" y="54" width="450" height="21"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZQD-06-YVI">
-                                                        <rect key="frame" x="-2" y="2" width="63" height="16"/>
-                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Todo side" id="O9a-3Q-HB1">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="90f-Y4-sgi">
+                                                        <rect key="frame" x="-2" y="3" width="98" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Todo app width" id="6e0-ji-qXw">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rB8-CF-Yrt">
-                                                        <rect key="frame" x="64" y="-4" width="71" height="25"/>
-                                                        <popUpButtonCell key="cell" type="push" title="Right" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="DG2-BN-GPE" id="wsh-YF-QuF">
-                                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                            <font key="font" metaFont="menu"/>
-                                                            <menu key="menu" id="8Vk-9N-Pkg">
-                                                                <items>
-                                                                    <menuItem title="Left" tag="2" id="mpl-sd-2Wc"/>
-                                                                    <menuItem title="Right" state="on" tag="1" id="DG2-BN-GPE"/>
-                                                                </items>
-                                                            </menu>
-                                                        </popUpButtonCell>
-                                                        <connections>
-                                                            <action selector="setTodoAppSide:" target="yhc-gS-h02" id="N1M-tN-4eI"/>
-                                                        </connections>
-                                                    </popUpButton>
+                                                    <textField verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="9VW-Hc-lh2" customClass="AutoSaveFloatField" customModule="Rectangle" customModuleProvider="target">
+                                                        <rect key="frame" x="102" y="0.0" width="100" height="21"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="A6q-mA-Xaq"/>
+                                                            <constraint firstAttribute="width" priority="250" constant="100" id="Ebz-nb-cys"/>
+                                                        </constraints>
+                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="400" drawsBackground="YES" id="lUu-Hs-vuk">
+                                                            <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="O5b-ir-jyO"/>
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                    <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eTN-Lz-EDf">
+                                                        <rect key="frame" x="208" y="3" width="105" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="px" id="HVG-6v-eJH">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pon-Fc-IkL">
+                                                        <rect key="frame" x="319" y="1" width="131" height="20"/>
+                                                        <subviews>
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZQD-06-YVI">
+                                                                <rect key="frame" x="-2" y="2" width="63" height="16"/>
+                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Todo side" id="O9a-3Q-HB1">
+                                                                    <font key="font" metaFont="system"/>
+                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                            <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rB8-CF-Yrt">
+                                                                <rect key="frame" x="64" y="-4" width="71" height="25"/>
+                                                                <popUpButtonCell key="cell" type="push" title="Right" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="DG2-BN-GPE" id="wsh-YF-QuF">
+                                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                                    <font key="font" metaFont="menu"/>
+                                                                    <menu key="menu" id="8Vk-9N-Pkg">
+                                                                        <items>
+                                                                            <menuItem title="Left" tag="2" id="mpl-sd-2Wc"/>
+                                                                            <menuItem title="Right" state="on" tag="1" id="DG2-BN-GPE"/>
+                                                                        </items>
+                                                                    </menu>
+                                                                </popUpButtonCell>
+                                                                <connections>
+                                                                    <action selector="setTodoAppSide:" target="yhc-gS-h02" id="N1M-tN-4eI"/>
+                                                                </connections>
+                                                            </popUpButton>
+                                                        </subviews>
+                                                        <visibilityPriorities>
+                                                            <integer value="1000"/>
+                                                            <integer value="1000"/>
+                                                        </visibilityPriorities>
+                                                        <customSpacing>
+                                                            <real value="3.4028234663852886e+38"/>
+                                                            <real value="3.4028234663852886e+38"/>
+                                                        </customSpacing>
+                                                    </stackView>
                                                 </subviews>
                                                 <visibilityPriorities>
                                                     <integer value="1000"/>
                                                     <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
                                                 </visibilityPriorities>
                                                 <customSpacing>
                                                     <real value="3.4028234663852886e+38"/>
                                                     <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
                                                 </customSpacing>
                                             </stackView>
-                                        </subviews>
-                                        <visibilityPriorities>
-                                            <integer value="1000"/>
-                                            <integer value="1000"/>
-                                            <integer value="1000"/>
-                                            <integer value="1000"/>
-                                        </visibilityPriorities>
-                                        <customSpacing>
-                                            <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
-                                        </customSpacing>
-                                    </stackView>
-                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="1000" verticalStackHuggingPriority="249.99998474121094" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nsh-GW-hpI">
-                                        <rect key="frame" x="0.0" y="169" width="450" height="19"/>
-                                        <subviews>
-                                            <textField horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="cEi-pr-62P">
-                                                <rect key="frame" x="-2" y="2" width="79" height="16"/>
-                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Toggle Todo" id="DHt-cE-Bl0">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <customView horizontalHuggingPriority="249" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="uca-0m-naE" customClass="MASShortcutView">
-                                                <rect key="frame" x="85" y="0.0" width="160" height="19"/>
+                                            <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="1000" verticalStackHuggingPriority="249.99998474121094" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" ambiguous="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nsh-GW-hpI">
+                                                <rect key="frame" x="0.0" y="27" width="450" height="19"/>
+                                                <subviews>
+                                                    <textField horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="cEi-pr-62P">
+                                                        <rect key="frame" x="-2" y="2" width="79" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Toggle Todo" id="DHt-cE-Bl0">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                    <customView horizontalHuggingPriority="249" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="uca-0m-naE" customClass="MASShortcutView">
+                                                        <rect key="frame" x="85" y="0.0" width="160" height="19"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="19" id="OaK-b4-dxO"/>
+                                                            <constraint firstAttribute="width" constant="160" id="tiw-8m-NjR"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalCompressionResistancePriority="250" ambiguous="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qC3-Q0-xyP">
+                                                        <rect key="frame" x="255" y="0.0" width="195" height="19"/>
+                                                    </stackView>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="19" id="OaK-b4-dxO"/>
-                                                    <constraint firstAttribute="width" constant="160" id="tiw-8m-NjR"/>
+                                                    <constraint firstItem="qC3-Q0-xyP" firstAttribute="top" secondItem="nsh-GW-hpI" secondAttribute="top" id="qJs-uS-q2u"/>
                                                 </constraints>
-                                            </customView>
-                                            <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qC3-Q0-xyP">
-                                                <rect key="frame" x="255" y="0.0" width="195" height="19"/>
+                                                <visibilityPriorities>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                </visibilityPriorities>
+                                                <customSpacing>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                </customSpacing>
                                             </stackView>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="qC3-Q0-xyP" firstAttribute="top" secondItem="nsh-GW-hpI" secondAttribute="top" id="qJs-uS-q2u"/>
-                                        </constraints>
-                                        <visibilityPriorities>
-                                            <integer value="1000"/>
-                                            <integer value="1000"/>
-                                            <integer value="1000"/>
-                                        </visibilityPriorities>
-                                        <customSpacing>
-                                            <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
-                                        </customSpacing>
-                                    </stackView>
-                                    <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="1000" verticalStackHuggingPriority="249.99998474121094" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="83w-h7-hhH">
-                                        <rect key="frame" x="0.0" y="140" width="450" height="19"/>
-                                        <subviews>
-                                            <textField horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Cf5-4Q-E4I">
-                                                <rect key="frame" x="-2" y="2" width="79" height="16"/>
-                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Reflow Todo" id="Fx0-sm-DrT">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <customView horizontalHuggingPriority="249" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="QTZ-pv-mwo" customClass="MASShortcutView">
-                                                <rect key="frame" x="85" y="0.0" width="160" height="19"/>
+                                            <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="1000" verticalStackHuggingPriority="249.99998474121094" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" ambiguous="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="83w-h7-hhH">
+                                                <rect key="frame" x="0.0" y="0.0" width="450" height="19"/>
+                                                <subviews>
+                                                    <textField horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Cf5-4Q-E4I">
+                                                        <rect key="frame" x="-2" y="2" width="79" height="16"/>
+                                                        <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Reflow Todo" id="Fx0-sm-DrT">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                    <customView horizontalHuggingPriority="249" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="QTZ-pv-mwo" customClass="MASShortcutView">
+                                                        <rect key="frame" x="85" y="0.0" width="160" height="19"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="19" id="Prr-fE-EFT"/>
+                                                            <constraint firstAttribute="width" constant="160" id="cxk-A1-9US"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalCompressionResistancePriority="250" ambiguous="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="42U-If-Yqd">
+                                                        <rect key="frame" x="255" y="0.0" width="195" height="19"/>
+                                                    </stackView>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="19" id="Prr-fE-EFT"/>
-                                                    <constraint firstAttribute="width" constant="160" id="cxk-A1-9US"/>
+                                                    <constraint firstItem="42U-If-Yqd" firstAttribute="top" secondItem="83w-h7-hhH" secondAttribute="top" id="iv8-9p-mSw"/>
                                                 </constraints>
-                                            </customView>
-                                            <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalCompressionResistancePriority="250" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="42U-If-Yqd">
-                                                <rect key="frame" x="255" y="0.0" width="195" height="19"/>
+                                                <visibilityPriorities>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                </visibilityPriorities>
+                                                <customSpacing>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                </customSpacing>
                                             </stackView>
                                         </subviews>
-                                        <constraints>
-                                            <constraint firstItem="42U-If-Yqd" firstAttribute="top" secondItem="83w-h7-hhH" secondAttribute="top" id="iv8-9p-mSw"/>
-                                        </constraints>
                                         <visibilityPriorities>
                                             <integer value="1000"/>
                                             <integer value="1000"/>
@@ -3130,8 +3145,6 @@
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
-                                    <integer value="1000"/>
-                                    <integer value="1000"/>
                                 </visibilityPriorities>
                                 <customSpacing>
                                     <real value="3.4028234663852886e+38"/>
@@ -3150,8 +3163,6 @@
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
-                                    <real value="3.4028234663852886e+38"/>
-                                    <real value="3.4028234663852886e+38"/>
                                 </customSpacing>
                             </stackView>
                         </subviews>
@@ -3179,6 +3190,7 @@
                         <outlet property="todoAppSidePopUpButton" destination="rB8-CF-Yrt" id="oNn-QO-3IC"/>
                         <outlet property="todoAppWidthField" destination="9VW-Hc-lh2" id="o0g-BR-XOK"/>
                         <outlet property="todoCheckbox" destination="0PP-0x-QWc" id="F1A-VF-cT5"/>
+                        <outlet property="todoView" destination="lRr-k7-YZR" id="Hcn-7a-WBS"/>
                         <outlet property="toggleTodoShortcutView" destination="uca-0m-naE" id="tnB-hD-SfB"/>
                         <outlet property="unsnapRestoreButton" destination="9Ed-T3-hCA" id="3UI-gj-R73"/>
                         <outlet property="versionLabel" destination="Azi-Y9-9xa" id="P8e-ZA-J6X"/>
diff --git a/Rectangle/PrefsWindow/SettingsViewController.swift b/Rectangle/PrefsWindow/SettingsViewController.swift
index 169a10c5b..ce1194d4e 100644
--- a/Rectangle/PrefsWindow/SettingsViewController.swift
+++ b/Rectangle/PrefsWindow/SettingsViewController.swift
@@ -24,6 +24,7 @@ class SettingsViewController: NSViewController {
     @IBOutlet weak var gapLabel: NSTextField!
     @IBOutlet weak var cursorAcrossCheckbox: NSButton!
     @IBOutlet weak var todoCheckbox: NSButton!
+    @IBOutlet weak var todoView: NSStackView!
     @IBOutlet weak var todoAppWidthField: AutoSaveFloatField!
     @IBOutlet weak var todoAppSidePopUpButton: NSPopUpButton!
     @IBOutlet weak var toggleTodoShortcutView: MASShortcutView!
@@ -93,6 +94,7 @@ class SettingsViewController: NSViewController {
     @IBAction func toggleTodoMode(_ sender: NSButton) {
         let newSetting: Bool = sender.state == .on
         Defaults.todo.enabled = newSetting
+        showHideTodoModeSettings()
         Notification.Name.todoMenuToggled.post()
     }
     
@@ -113,8 +115,7 @@ class SettingsViewController: NSViewController {
 
         Defaults.todoSidebarSide.value = side
         
-        guard Defaults.todo.userEnabled && Defaults.todoMode.enabled else { return }
-        TodoManager.moveAll(false)
+        TodoManager.moveAllIfNeeded(false)
     }
     
     @IBAction func stageSliderChanged(_ sender: NSSlider) {
@@ -205,12 +206,18 @@ class SettingsViewController: NSViewController {
         todoAppWidthField.delegate = self
         todoAppWidthField.defaults = Defaults.todoSidebarWidth
         todoAppWidthField.defaultsSetAction = {
-            guard Defaults.todo.userEnabled && Defaults.todoMode.enabled else { return }
-            TodoManager.moveAll(false)
+            TodoManager.moveAllIfNeeded(false)
         }
         todoAppSidePopUpButton.selectItem(withTag: Defaults.todoSidebarSide.value.rawValue)
+        TodoManager.initToggleShortcut()
+        TodoManager.initReflowShortcut()
         toggleTodoShortcutView.setAssociatedUserDefaultsKey(TodoManager.toggleDefaultsKey, withTransformerName: MASDictionaryTransformerName)
         reflowTodoShortcutView.setAssociatedUserDefaultsKey(TodoManager.reflowDefaultsKey, withTransformerName: MASDictionaryTransformerName)
+        showHideTodoModeSettings()
+    }
+    
+    private func showHideTodoModeSettings() {
+        todoView.isHidden = !Defaults.todo.userEnabled
     }
     
     func initializeToggles() {
diff --git a/Rectangle/Snapping/SnappingManager.swift b/Rectangle/Snapping/SnappingManager.swift
index 1fbb84f9e..c89801804 100644
--- a/Rectangle/Snapping/SnappingManager.swift
+++ b/Rectangle/Snapping/SnappingManager.swift
@@ -344,7 +344,7 @@ class SnappingManager {
     func getBoxRect(hotSpot: SnapArea, currentWindow: Window) -> CGRect? {
         if let calculation = WindowCalculationFactory.calculationsByAction[hotSpot.action] {
             
-            let ignoreTodo = TodoManager.isTodoWindow(id: currentWindow.id)
+            let ignoreTodo = TodoManager.isTodoWindow(currentWindow.id)
             let rectCalcParams = RectCalculationParameters(window: currentWindow, visibleFrameOfScreen: hotSpot.screen.adjustedVisibleFrame(ignoreTodo), action: hotSpot.action, lastAction: nil)
             let rectResult = calculation.calculateRect(rectCalcParams)
             
@@ -368,7 +368,7 @@ class SnappingManager {
             guard let directional = directionalLocationOfCursor(loc: loc, screen: screen)
             else { continue }
             
-            if let windowId = windowId, Defaults.todo.userEnabled && Defaults.todoMode.enabled && TodoManager.isTodoWindow(id: windowId) {
+            if let windowId = windowId, Defaults.todo.userEnabled && Defaults.todoMode.enabled && TodoManager.isTodoWindow(windowId) {
                 if Defaults.todoSidebarSide.value == .left && directional == .l {
                     return SnapArea(screen: screen, directional: directional, action: .leftTodo)
                 }
diff --git a/Rectangle/TodoMode/TodoManager.swift b/Rectangle/TodoMode/TodoManager.swift
index 341e7d8c3..4df80fef1 100644
--- a/Rectangle/TodoMode/TodoManager.swift
+++ b/Rectangle/TodoMode/TodoManager.swift
@@ -10,13 +10,20 @@ import Cocoa
 import MASShortcut
 
 class TodoManager {
+    private static var todoWindowId: CGWindowID?
+    
     static var todoScreen : NSScreen?
     static let toggleDefaultsKey = "toggleTodo"
     static let reflowDefaultsKey = "reflowTodo"
     static let defaultsKeys = [toggleDefaultsKey, reflowDefaultsKey]
     
-    static func registerToggleShortcut() {
-        
+    static func setTodoMode(_ enabled: Bool, _ bringToFront: Bool = true) {
+        Defaults.todoMode.enabled = enabled
+        registerUnregisterReflowShortcut()
+        moveAllIfNeeded(bringToFront)
+    }
+    
+    static func initToggleShortcut() {
         if UserDefaults.standard.dictionary(forKey: toggleDefaultsKey) == nil {
             guard let dictTransformer = ValueTransformer(forName: NSValueTransformerName(rawValue: MASDictionaryTransformerName)) else { return }
             
@@ -25,18 +32,9 @@ class TodoManager {
             let toggleShortcutDict = dictTransformer.reverseTransformedValue(toggleShortcut)
             UserDefaults.standard.set(toggleShortcutDict, forKey: toggleDefaultsKey)
         }
-
-        MASShortcutBinder.shared()?.bindShortcut(withDefaultsKey: toggleDefaultsKey, toAction: {
-            guard Defaults.todo.userEnabled else { return }
-            Defaults.todoMode.enabled.toggle()
-            if Defaults.todoMode.enabled {
-                TodoManager.moveAll()
-            }
-        })
     }
     
-    static func registerReflowShortcut() {
-        
+    static func initReflowShortcut() {
         if UserDefaults.standard.dictionary(forKey: reflowDefaultsKey) == nil {
             guard let dictTransformer = ValueTransformer(forName: NSValueTransformerName(rawValue: MASDictionaryTransformerName)) else { return }
             
@@ -45,34 +43,92 @@ class TodoManager {
             let reflowShortcutDict = dictTransformer.reverseTransformedValue(reflowShortcut)
             UserDefaults.standard.set(reflowShortcutDict, forKey: reflowDefaultsKey)
         }
-
+    }
+    
+    private static func registerToggleShortcut() {
+        MASShortcutBinder.shared()?.bindShortcut(withDefaultsKey: toggleDefaultsKey, toAction: {
+            let enabled = !Defaults.todoMode.enabled
+            setTodoMode(enabled)
+        })
+    }
+    
+    private static func registerReflowShortcut() {
         MASShortcutBinder.shared()?.bindShortcut(withDefaultsKey: reflowDefaultsKey, toAction: {
-            guard Defaults.todo.userEnabled && Defaults.todoMode.enabled else { return }
-            TodoManager.moveAll()
+            moveAll()
         })
     }
     
+    private static func unregisterToggleShortcut() {
+        MASShortcutBinder.shared()?.breakBinding(withDefaultsKey: toggleDefaultsKey)
+    }
+    
+    private static func unregisterReflowShortcut() {
+        MASShortcutBinder.shared()?.breakBinding(withDefaultsKey: reflowDefaultsKey)
+    }
+    
+    static func registerUnregisterToggleShortcut() {
+        if Defaults.todo.userEnabled {
+            registerToggleShortcut()
+        } else {
+            unregisterToggleShortcut()
+        }
+    }
+    
+    static func registerUnregisterReflowShortcut() {
+        if Defaults.todo.userEnabled && Defaults.todoMode.enabled {
+            registerReflowShortcut()
+        } else {
+            unregisterReflowShortcut()
+        }
+    }
+    
     static func getToggleKeyDisplay() -> (String?, NSEvent.ModifierFlags)? {
-        guard let masShortcut = MASShortcutBinder.shared()?.value(forKey: toggleDefaultsKey) as? MASShortcut else { return nil }
-        return (masShortcut.keyCodeStringForKeyEquivalent, masShortcut.modifierFlags)
+        guard
+            let shortcutDict = UserDefaults.standard.dictionary(forKey: toggleDefaultsKey),
+            let dictTransformer = ValueTransformer(forName: NSValueTransformerName(rawValue: MASDictionaryTransformerName)),
+            let shortcut = dictTransformer.transformedValue(shortcutDict) as? MASShortcut
+        else {
+            return nil
+        }
+        return (shortcut.keyCodeStringForKeyEquivalent, shortcut.modifierFlags)
     }
     
     static func getReflowKeyDisplay() -> (String?, NSEvent.ModifierFlags)? {
-        guard let masShortcut = MASShortcutBinder.shared()?.value(forKey: reflowDefaultsKey) as? MASShortcut else { return nil }
-        return (masShortcut.keyCodeStringForKeyEquivalent, masShortcut.modifierFlags)
+        guard
+            let shortcutDict = UserDefaults.standard.dictionary(forKey: reflowDefaultsKey),
+            let dictTransformer = ValueTransformer(forName: NSValueTransformerName(rawValue: MASDictionaryTransformerName)),
+            let shortcut = dictTransformer.transformedValue(shortcutDict) as? MASShortcut
+        else {
+            return nil
+        }
+        return (shortcut.keyCodeStringForKeyEquivalent, shortcut.modifierFlags)
     }
     
-    static func isTodoWindow(_ w: AccessibilityElement) -> Bool {
-        guard let todoWindow = AccessibilityElement.getTodoWindowElement() else { return false }
-        return isTodoWindow(w, todoWindow: todoWindow)
+    private static func getTodoWindowElement() -> AccessibilityElement? {
+        guard let bundleId = Defaults.todoApplication.value, let windowElements = AccessibilityElement(bundleId)?.windowElements else {
+            todoWindowId = nil
+            return nil
+        }
+        if let windowId = todoWindowId, !(windowElements.contains { $0.windowId == windowId }) {
+            todoWindowId = nil
+        }
+        if todoWindowId == nil {
+            todoWindowId = windowElements.first?.windowId
+        }
+        if let windowId = todoWindowId, let windowElement = (windowElements.first { $0.windowId == windowId }) {
+            return windowElement
+        }
+        todoWindowId = nil
+        return nil
     }
     
-    static func isTodoWindow(id: CGWindowID) -> Bool {
-        AccessibilityElement.getTodoWindowElement()?.getWindowId() == id
+    static func isTodoWindow(_ windowElement: AccessibilityElement) -> Bool {
+        guard let windowId = windowElement.windowId else { return false }
+        return isTodoWindow(windowId)
     }
-
-    private static func isTodoWindow(_ w: AccessibilityElement, todoWindow: AccessibilityElement) -> Bool {
-        return w.getWindowId() == todoWindow.getWindowId()
+    
+    static func isTodoWindow(_ windowId: CGWindowID) -> Bool {
+        return getTodoWindowElement()?.windowId == windowId
     }
     
     static func moveAll(_ bringToFront: Bool = true) {
@@ -82,7 +138,7 @@ class TodoManager {
         // Avoid footprint window
         let windows = AccessibilityElement.getAllWindowElements().filter { $0.pid != pid }
 
-        if let todoWindow = AccessibilityElement.getTodoWindowElement() {
+        if let todoWindow = getTodoWindowElement() {
             if let screen = TodoManager.todoScreen {
                 let sd = ScreenDetection()
                 var adjustedVisibleFrame = screen.adjustedVisibleFrame()
@@ -120,8 +176,13 @@ class TodoManager {
         }
     }
     
+    static func moveAllIfNeeded(_ bringToFront: Bool = true) {
+        guard Defaults.todo.userEnabled && Defaults.todoMode.enabled else { return }
+        moveAll(bringToFront)
+    }
+    
     private static func refreshTodoScreen() {
-        let todoWindow = AccessibilityElement.getTodoWindowElement()
+        let todoWindow = getTodoWindowElement()
         let screens = ScreenDetection().detectScreens(using: todoWindow)
         TodoManager.todoScreen = screens?.currentScreen
     }
diff --git a/Rectangle/WindowManager.swift b/Rectangle/WindowManager.swift
index 4b661ff66..c88c972f9 100644
--- a/Rectangle/WindowManager.swift
+++ b/Rectangle/WindowManager.swift
@@ -91,7 +91,7 @@ class WindowManager {
             }
         }
         
-        let ignoreTodo = TodoManager.isTodoWindow(id: windowId)
+        let ignoreTodo = TodoManager.isTodoWindow(windowId)
         
         if frontmostWindowElement.isSheet == true
             || currentWindowRect.isNull