diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a5a1349f..d55d0deda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -475,12 +475,6 @@ find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
 target_link_libraries (Aegisub ${OPENGL_LIBRARIES})
 
-find_package(Hunspell REQUIRED)
-include_directories(${HUNSPELL_INCLUDE_DIR})
-target_link_libraries (Aegisub ${HUNSPELL_LIBRARIES})
-add_definitions("-DWITH_HUNSPELL")
-target_sources(Aegisub PRIVATE src/spellchecker_hunspell.cpp)
-
 find_package(Iconv REQUIRED)
 include_directories(${Iconv_INCLUDE_DIRS})
 target_link_libraries (Aegisub ${Iconv_LIBRARIES})
@@ -545,6 +539,14 @@ if (FFTW_FOUND)
     add_definitions("-DWITH_FFTW3")
 endif(FFTW_FOUND)
 
+find_package(Hunspell)
+if (HUNSPELL_FOUND)
+    include_directories(${HUNSPELL_INCLUDE_DIR})
+    target_link_libraries (Aegisub ${HUNSPELL_LIBRARIES})
+    add_definitions("-DWITH_HUNSPELL")
+    target_sources(Aegisub PRIVATE src/spellchecker_hunspell.cpp)
+endif (HUNSPELL_FOUND)
+
 #ifdef WITH_LIBPULSE
 #add_definitions("-DWITH_LIBPULSE")
 #target_sources(Aegisub PRIVATE src/audio_player_pulse.cpp)
diff --git a/src/spellchecker.cpp b/src/spellchecker.cpp
index 4e328ab22..3d99d4de1 100644
--- a/src/spellchecker.cpp
+++ b/src/spellchecker.cpp
@@ -22,10 +22,12 @@
 #include <libaegisub/make_unique.h>
 #include <libaegisub/spellchecker.h>
 
+#ifdef __APPLE__
 namespace agi {
 class OptionValue;
 std::unique_ptr<agi::SpellChecker> CreateCocoaSpellChecker(OptionValue *opt);
 }
+#endif
 
 std::unique_ptr<agi::SpellChecker> SpellCheckerFactory::GetSpellChecker() {
 #ifdef __APPLE__
diff --git a/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp
index a44c099e0..1a87c147c 100644
--- a/src/subs_edit_ctrl.cpp
+++ b/src/subs_edit_ctrl.cpp
@@ -388,15 +388,16 @@ void SubsTextEditCtrl::OnContextMenu(wxContextMenuEvent &event) {
 	currentWord = line_text.substr(currentWordPos.first, currentWordPos.second);
 
 	wxMenu menu;
-	if (spellchecker)
+	if (spellchecker) {
 		AddSpellCheckerEntries(menu);
 
-	// Append language list
-	menu.Append(-1,_("Spell checker language"), GetLanguagesMenu(
-		EDIT_MENU_DIC_LANGS,
-		to_wx(OPT_GET("Tool/Spell Checker/Language")->GetString()),
-		to_wx(spellchecker->GetLanguageList())));
-	menu.AppendSeparator();
+		// Append language list
+		menu.Append(-1, _("Spell checker language"), GetLanguagesMenu(
+			EDIT_MENU_DIC_LANGS,
+			to_wx(OPT_GET("Tool/Spell Checker/Language")->GetString()),
+			to_wx(spellchecker->GetLanguageList())));
+		menu.AppendSeparator();
+	}
 
 	AddThesaurusEntries(menu);