diff --git a/Terminal.Gui/Application.cs b/Terminal.Gui/Application.cs
index 664eb6dd0..670b5674e 100644
--- a/Terminal.Gui/Application.cs
+++ b/Terminal.Gui/Application.cs
@@ -1374,15 +1374,9 @@ public static partial class Application
             return;
         }
 
+        // TODO: In PR #3273, FindDeepestView will return adornments. Update logic below to fix adornment mouse handling
         var view = View.FindDeepestView (Current, a.MouseEvent.X, a.MouseEvent.Y);
 
-        // TODO: Remove this temporary filter:
-        if (view is Adornment adornment)
-        {
-            view = adornment.Parent;
-        }
-
-
         if (view is { WantContinuousButtonPressed: true })
         {
             WantContinuousButtonPressedView = view;
diff --git a/Terminal.Gui/View/Layout/ViewLayout.cs b/Terminal.Gui/View/Layout/ViewLayout.cs
index 7b78a6413..85441c1e5 100644
--- a/Terminal.Gui/View/Layout/ViewLayout.cs
+++ b/Terminal.Gui/View/Layout/ViewLayout.cs
@@ -550,7 +550,7 @@ public partial class View
     /// <param name="start">The superview where to look for.</param>
     /// <param name="x">The column location in the superview.</param>
     /// <param name="y">The row location in the superview.</param>
-    /// <param name="findAdornments">TODO: Remove this after unit tests are fixed</param>
+    /// <param name="findAdornments">TODO: Remove this in PR #3273</param>
     /// <returns>
     ///     The view that was found at the <paramref name="x"/> and <paramref name="y"/> coordinates.
     ///     <see langword="null"/> if no view was found.
@@ -572,6 +572,7 @@ public partial class View
 
         if (findAdornments)
         {
+            // TODO: This is a temporary hack for PR #3273; it is not actually used anywhere but unit tests at this point.
             if (start.Margin.Thickness.Contains (start.Margin.Frame, x, y))
             {
                 return start.Margin;