diff --git a/include/note.php b/include/note.php
index fec4edf..9b0e8fb 100644
--- a/include/note.php
+++ b/include/note.php
@@ -333,11 +333,17 @@ class Note {
 
     function outputEditor($aValues = null)
     {
-        if(!$this->iVersionId)
-            $this->iVersionId = getInput('iVersionId', $aValues);
+        if($aValues)
+        {
+            if(!$this->iVersionId)
+                $this->iVersionId = getInput('iVersionId', $aValues);
 
-        if(!$this->iAppId)
-            $this->iAppId = getInput('iAppId', $aValues);
+            if(!$this->iAppId)
+                $this->iAppId = getInput('iAppId', $aValues);
+
+            if(!$this->sTitle)
+                $this->sTitle = getInput('sNoteTitle', $aValues);
+        }
 
         if($this->iAppId && !$this->iVersionId)
             $this->iVersionId = APPNOTE_SHOW_FOR_ALL;
@@ -348,9 +354,6 @@ class Note {
             $this->iAppId = $oVersion->iAppId;
         }
 
-        if(!$this->sTitle)
-            $this->sTitle = getInput('sNoteTitle', $aValues);
-
         HtmlAreaLoaderScript(array("editor"));
 
         echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0);