diff --git a/src/notebook.cc b/src/notebook.cc
index 193f7ee..c9eb343 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -147,6 +147,8 @@ void Notebook::open(const boost::filesystem::path &file_path_, size_t notebook_i
     if(language_protocol_language_id == "js") {
       if(file_path.extension() == ".ts")
         language_protocol_language_id = "typescript";
+      else if(file_path.extension() == ".tsx")
+        language_protocol_language_id = "typescriptreact";
       else
         language_protocol_language_id = "javascript";
     }
diff --git a/src/source.cc b/src/source.cc
index 67613e1..ca3cbe6 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -51,7 +51,7 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
       language = language_manager->get_language("makefile");
     else if(file_path.extension() == ".tcc")
       language = language_manager->get_language("cpphdr");
-    else if(file_path.extension() == ".ts" || file_path.extension() == ".jsx" || file_path.extension() == ".flow")
+    else if(file_path.extension() == ".ts" || file_path.extension() == ".tsx" || file_path.extension() == ".jsx" || file_path.extension() == ".flow")
       language = language_manager->get_language("js");
     else if(!file_path.has_extension()) {
       for(auto &part : file_path) {