diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp
index 6de0a862f..be09c9662 100644
--- a/apps/code/editor_controller.cpp
+++ b/apps/code/editor_controller.cpp
@@ -65,7 +65,7 @@ void EditorController::viewWillAppear() {
   ViewController::viewWillAppear();
   m_editorView.loadSyntaxHighlighter();
   if(GlobalPreferences::sharedGlobalPreferences()->cursorSaving()) {
-    m_editorView.setCursorLocation(m_script.content() + *m_script.CursorPosition());
+    m_editorView.setCursorLocation(m_editorView.text() + strlen(m_editorView.text()));
   } else {
     m_editorView.setCursorLocation(m_editorView.text() + strlen(m_editorView.text()));
   }