diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index 6a9f7a36d..9363fc448 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -57,7 +57,6 @@
 #include "compat.h"
 #include "frame_main.h"
 #include "main.h"
-#include "subs_edit_box.h"
 #include "utils.h"
 #include "video_context.h"
 #include "video_slider.h"
diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index 22017469b..f5f3eaab0 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -50,7 +50,6 @@
 #include "../ass_file.h"
 #include "../dialog_search_replace.h"
 #include "../include/aegisub/context.h"
-#include "../subs_edit_box.h"
 #include "../subs_edit_ctrl.h"
 #include "../subs_grid.h"
 #include "../video_context.h"
@@ -82,8 +81,8 @@ struct edit_line_copy : public validate_sel_nonempty {
 	STR_HELP("Copy subtitles.")
 
 	void operator()(agi::Context *c) {
-		if (c->parent->FindFocus() == c->editBox->TextEdit) {
-			c->editBox->TextEdit->Copy();
+		if (c->parent->FindFocus() == c->editBox) {
+			c->editBox->Copy();
 			return;
 		}
 		c->subsGrid->CopyLines(c->subsGrid->GetSelection());
@@ -99,8 +98,8 @@ struct edit_line_cut: public validate_sel_nonempty {
 	STR_HELP("Cut subtitles.")
 
 	void operator()(agi::Context *c) {
-		if (c->parent->FindFocus() == c->editBox->TextEdit) {
-			c->editBox->TextEdit->Cut();
+		if (c->parent->FindFocus() == c->editBox) {
+			c->editBox->Cut();
 			return;
 		}
 		c->subsGrid->CutLines(c->subsGrid->GetSelection());
@@ -251,8 +250,8 @@ struct edit_line_paste : public Command {
 	}
 
 	void operator()(agi::Context *c) {
-		if (c->parent->FindFocus() == c->editBox->TextEdit) {
-			c->editBox->TextEdit->Paste();
+		if (c->parent->FindFocus() == c->editBox) {
+			c->editBox->Paste();
 			return;
 		}
 		c->subsGrid->PasteLines(c->subsGrid->GetFirstSelRow());
diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp
index 6836ca1cd..b1ae6bd55 100644
--- a/aegisub/src/command/timecode.cpp
+++ b/aegisub/src/command/timecode.cpp
@@ -45,10 +45,9 @@
 #include "command.h"
 
 #include "../include/aegisub/context.h"
-#include "../video_context.h"
-#include "../main.h"
 #include "../compat.h"
-#include "../subs_edit_box.h"
+#include "../main.h"
+#include "../video_context.h"
 
 namespace {
 	using cmd::Command;
diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp
index 9666c6e8d..2ac41b23b 100644
--- a/aegisub/src/dialog_search_replace.cpp
+++ b/aegisub/src/dialog_search_replace.cpp
@@ -50,7 +50,6 @@
 #include "frame_main.h"
 #include "main.h"
 #include "selection_controller.h"
-#include "subs_edit_box.h"
 #include "subs_edit_ctrl.h"
 #include "subs_grid.h"
 #include "video_display.h"
@@ -454,7 +453,7 @@ void SearchReplaceEngine::ReplaceNext(bool DoReplace) {
 		context->subsGrid->MakeCellVisible(curLine,0);
 		if (field == 0) {
 			context->subsGrid->SetActiveLine(context->subsGrid->GetDialogue(curLine));
-			context->editBox->TextEdit->SetSelectionU(pos,pos+replaceLen);
+			context->editBox->SetSelectionU(pos,pos+replaceLen);
 		}
 
 		// Update video
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index 86a23625a..cdd1fd153 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -36,11 +36,11 @@
 #include "ass_file.h"
 #include "compat.h"
 #include "help_button.h"
-#include "libresrc/libresrc.h"
-#include "main.h"
 #include "include/aegisub/context.h"
 #include "include/aegisub/spellchecker.h"
-#include "subs_edit_box.h"
+#include "libresrc/libresrc.h"
+#include "main.h"
+#include "selection_controller.h"
 #include "subs_edit_ctrl.h"
 #include "utils.h"
 
@@ -191,7 +191,7 @@ void DialogSpellChecker::OnClose(wxCommandEvent&) {
 
 bool DialogSpellChecker::FindNext() {
 	AssDialogue *active_line = context->selectionController->GetActiveLine();
-	int start_pos = context->editBox->TextEdit->GetReverseUnicodePosition(context->editBox->TextEdit->GetCurrentPos());
+	int start_pos = context->editBox->GetReverseUnicodePosition(context->editBox->GetCurrentPos());
 	int commit_id = -1;
 
 	if (CheckLine(active_line, start_pos, &commit_id))
@@ -266,7 +266,7 @@ void DialogSpellChecker::Replace() {
 	if (active_line->Text.Mid(word_start, word_end - word_start) == orig_word->GetValue()) {
 		active_line->Text = active_line->Text.Left(word_start) + replace_word->GetValue() + active_line->Text.Mid(word_end);
 		context->ass->Commit(_("spell check replace"), AssFile::COMMIT_DIAG_TEXT);
-		context->editBox->TextEdit->SetCurrentPos(context->editBox->TextEdit->GetUnicodePosition(word_start + replace_word->GetValue().size()));
+		context->editBox->SetCurrentPos(context->editBox->GetUnicodePosition(word_start + replace_word->GetValue().size()));
 	}
 }
 
@@ -278,8 +278,8 @@ void DialogSpellChecker::SetWord(wxString const& word) {
 	suggest_list->Clear();
 	suggest_list->Append(suggestions);
 
-	context->editBox->TextEdit->SetSelectionU(word_start, word_end);
-	context->editBox->TextEdit->SetCurrentPos(context->editBox->TextEdit->GetUnicodePosition(word_end));
+	context->editBox->SetSelectionU(word_start, word_end);
+	context->editBox->SetCurrentPos(context->editBox->GetUnicodePosition(word_end));
 
 	add_button->Enable(spellchecker->CanAddWord(word));
 }
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 22c4c6c45..714b57401 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -274,7 +274,8 @@ void FrameMain::InitContents() {
 	audioSash->SetMinimumSizeY(audioBox->GetSize().GetHeight());
 
 	StartupLog("Create subtitle editing box");
-	context->editBox = EditBox = new SubsEditBox(Panel, context.get());
+	EditBox = new SubsEditBox(Panel, context.get());
+	context->editBox = EditBox->TextEdit;
 
 	StartupLog("Arrange main sizers");
 	ToolsSizer = new wxBoxSizer(wxVERTICAL);
diff --git a/aegisub/src/include/aegisub/context.h b/aegisub/src/include/aegisub/context.h
index 9b992d531..817c5845d 100644
--- a/aegisub/src/include/aegisub/context.h
+++ b/aegisub/src/include/aegisub/context.h
@@ -6,7 +6,7 @@ class DialogDetachedVideo;
 class DialogStyling;
 class DialogTranslation;
 template<class T> class SelectionController;
-class SubsEditBox;
+class SubsTextEditCtrl;
 class SubtitlesGrid;
 class VideoBox;
 class VideoContext;
@@ -34,7 +34,7 @@ struct Context {
 	DialogDetachedVideo *detachedVideo;
 	DialogStyling *stylingAssistant;
 	DialogTranslation *translationAssistant;
-	SubsEditBox *editBox;
+	SubsTextEditCtrl *editBox;
 	SubtitlesGrid *subsGrid;
 	VideoBox *videoBox;
 };
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 44826ecdb..3df73307a 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -60,7 +60,6 @@
 #include "dialog_paste_over.h"
 #include "frame_main.h"
 #include "main.h"
-#include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
 #include "video_context.h"
diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp
index e355a14b7..a2d8addef 100644
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@@ -53,7 +53,6 @@
 #include "libresrc/libresrc.h"
 #include "main.h"
 #include "selection_controller.h"
-#include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "toggle_bitmap.h"
 #include "tooltip_manager.h"
diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index 0f692a985..310572fe3 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -71,7 +71,6 @@
 #include "mkv_wrap.h"
 #include "selection_controller.h"
 #include "standard_paths.h"
-#include "subs_edit_box.h"
 #include "threaded_frame_source.h"
 #include "utils.h"
 #include "video_context.h"
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index c7b27af4e..392351257 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -47,7 +47,6 @@
 #include "ass_time.h"
 #include "include/aegisub/context.h"
 #include "main.h"
-#include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
 #include "video_context.h"