diff --git a/FoxTube/Controls/CommentCard.xaml b/FoxTube/Controls/CommentCard.xaml
index effe425..d1d0174 100644
--- a/FoxTube/Controls/CommentCard.xaml
+++ b/FoxTube/Controls/CommentCard.xaml
@@ -36,7 +36,7 @@
                 <TextBlock Name="text" IsTextSelectionEnabled="True" TextWrapping="WrapWholeWords" Grid.Row="2" Text="[Content]"/>
 
                 <StackPanel Grid.Row="2" Name="editor" Visibility="Collapsed">
-                    <TextBox Name="editorText" Text="[Content]" AcceptsReturn="True" Height="Auto" TextChanged="editorText_TextChanged"/>
+                    <TextBox Name="editorText" Text="[Content]" AcceptsReturn="True" TextWrapping="Wrap" TextChanged="editorText_TextChanged"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,0,5">
                         <Button Name="editorClose" Content="Cancel" Click="editorClose_Click"/>
                         <Button Name="editorSend" Content="Submit" Margin="5,0,0,0" Click="editorSend_Click"/>
@@ -86,7 +86,7 @@
             </Grid>
         </Grid>
 
-        <TextBox Grid.Row="1" Name="reply" TextChanged="reply_TextChanged" BorderThickness="0" Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" AcceptsReturn="True" MaxLength="500"
+        <TextBox Grid.Row="1" Name="reply" TextChanged="reply_TextChanged" TextWrapping="Wrap" BorderThickness="0" Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" AcceptsReturn="True" MaxLength="500"
                              Padding="5" Margin="0,0,32,0"
                              PlaceholderText="Enter your reply..."/>
         <Button Grid.Row="1" Name="send" Click="send_Click" IsEnabled="False" HorizontalAlignment="Right" VerticalAlignment="Top"
diff --git a/FoxTube/Pages/CommentsPage.xaml b/FoxTube/Pages/CommentsPage.xaml
index dbaa61b..cff7030 100644
--- a/FoxTube/Pages/CommentsPage.xaml
+++ b/FoxTube/Pages/CommentsPage.xaml
@@ -18,7 +18,7 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="30"/>
             </Grid.RowDefinitions>
-            <TextBox x:Uid="/CommentsPage/textbox" Margin="5,5,42,5" PlaceholderText="Add a public comment" Name="newComment" VerticalAlignment="Center" MinHeight="32" MaxHeight="100" Height="auto" AcceptsReturn="True"/>
+            <TextBox x:Uid="/CommentsPage/textbox" Margin="5,5,42,5" PlaceholderText="Add a public comment" Name="newComment" VerticalAlignment="Center" MinHeight="32" TextWrapping="Wrap" AcceptsReturn="True"/>
             <Button HorizontalAlignment="Right" Name="send" Click="send_Click"  VerticalAlignment="Top" 
                     Height="32" Width="32" 
                     Margin="0,5,5,0" Padding="0"
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index bed2de6..628e56e 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -1,44 +1,24 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.UI;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Shapes;
 using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 using System.Diagnostics;
-using Microsoft.Toolkit.Uwp.Notifications;
 using Windows.UI.Notifications;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.Storage;
 using System.Xml;
-
-using Google.Apis.Auth.OAuth2;
-using Google.Apis.Services;
-using Google.Apis.Upload;
-using Google.Apis.YouTube.v3;
 using Google.Apis.YouTube.v3.Data;
-using System.Threading.Tasks;
-using System.Threading;
-using Google.Apis.Util.Store;
 using System.Globalization;
 using Windows.ApplicationModel.Core;
 using Windows.System;
-using Windows.UI.Xaml.Documents;
 using Google.Apis.Oauth2.v2;
 using Google.Apis.Oauth2.v2.Data;
 using FoxTube.Controls;
 using FoxTube.Pages;
-using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.ApplicationModel;
 using System.Net;
 using Windows.UI.Popups;
@@ -699,7 +679,7 @@ namespace FoxTube
 
         private void Page_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
         {
-            if(videoPlaceholder.Content != null)
+            if(videoPlaceholder.Content != null && FocusManager.GetFocusedElement().GetType() != typeof(TextBox))
             {
                 e.Handled = true;
                 (videoPlaceholder.Content as VideoPage).player.KeyUpPressed(sender, e);