diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
index 4a17557e7217..71c6778a9cf0 100644
--- a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
+++ b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
@@ -404,9 +404,13 @@
 						<TextBox
 							x:Name="TileViewTextBoxItemName"
 							Grid.Row="0"
-							HorizontalAlignment="Left"
+							Grid.RowSpan="3"
+							MaxHeight="60"
+							HorizontalAlignment="Stretch"
 							BeforeTextChanging="ItemNameTextBox_BeforeTextChanging"
+							Canvas.ZIndex="1"
 							Text="{x:Bind Name, Mode=OneWay}"
+							TextWrapping="Wrap"
 							Visibility="Collapsed" />
 
 						<TextBlock
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
index 9457a2d866f9..9b741eae5277 100644
--- a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
+++ b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.UI;
-using Files.App.Data.Commands;
-using Files.App.Data.EventArguments;
 using Files.App.UserControls.Selection;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
@@ -531,4 +529,4 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
 		}
 
 	}
-}
+}
\ No newline at end of file