diff --git a/currentGitHash.txt b/currentGitHash.txt
index 59ed0b7acb..b5dfe047ba 100644
--- a/currentGitHash.txt
+++ b/currentGitHash.txt
@@ -1 +1 @@
-c08142b60dfc4ea71c335649649cda259c492d3b
+ff009c8f612d68acd88f3f1852df1c818bcba47c
diff --git a/hi_backend/backend/currentGit.h b/hi_backend/backend/currentGit.h
index c2cad43e71..e7c7c063b7 100644
--- a/hi_backend/backend/currentGit.h
+++ b/hi_backend/backend/currentGit.h
@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "c08142b60dfc4ea71c335649649cda259c492d3b" 
+#define PREVIOUS_HISE_COMMIT "ff009c8f612d68acd88f3f1852df1c818bcba47c"
diff --git a/hi_scripting/scripting/api/ScriptingApiContent.cpp b/hi_scripting/scripting/api/ScriptingApiContent.cpp
index 9b72c46f40..ca3a7e46fc 100644
--- a/hi_scripting/scripting/api/ScriptingApiContent.cpp
+++ b/hi_scripting/scripting/api/ScriptingApiContent.cpp
@@ -7594,7 +7594,7 @@ struct TextInputData: public ScriptingApi::Content::TextInputDataBase,
         
         inputLabel->setText(prop["text"].toString(), dontSendNotification);
         inputLabel->selectAll();
-        inputLabel->grabKeyboardFocus();
+        inputLabel->grabKeyboardFocusAsync();
     }
     
     void dismissAndCall(bool ok)
@@ -7604,7 +7604,11 @@ struct TextInputData: public ScriptingApi::Content::TextInputDataBase,
 
         var args[2] = {var(ok), var(inputLabel->getText())};
         
-        inputLabel->getParentComponent()->removeChildComponent(inputLabel);
+        if(auto pc = inputLabel->getParentComponent())
+        {
+            pc->removeChildComponent(inputLabel);
+        }
+        
         inputLabel = nullptr;
         
         if(callback)