diff --git a/src/help.cpp b/src/help.cpp
index 0bf1d49f..1ab0d751 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -179,7 +179,7 @@ void Help::GetKeybindings()
 #	ifdef HAVE_TAGLIB_H
 	*w << DisplayKeys(Key.EditTags) << "Edit song's tags/playlist's name\n";
 #	endif // HAVE_TAGLIB_H
-	*w << DisplayKeys(Key.GoToPosition) << "Go to chosen position in current song\n";
+	*w << DisplayKeys(Key.GoToPosition) << "Go to given position in current song (in % by default)\n";
 	*w << DisplayKeys(Key.SongInfo) << "Show song's info\n";
 #	ifdef HAVE_CURL_CURL_H
 	*w << DisplayKeys(Key.ArtistInfo) << "Show artist's info\n";
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index cbafe914..9bc62c54 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -1290,7 +1290,7 @@ int main(int argc, char *argv[])
 				continue;
 			}
 			LockStatusbar();
-			Statusbar() << "Position to go (in %/mm:ss/seconds): ";
+			Statusbar() << "Position to go (in %/mm:ss/seconds(s)): ";
 			string position = wFooter->GetString();
 			UnlockStatusbar();
 			
@@ -1308,18 +1308,18 @@ int main(int argc, char *argv[])
 				if (newpos > 0 && newpos < s->GetTotalLength())
 					Mpd->Seek(newpos);
 			}
-			else if (position.find('%') != string::npos) // probably position in %
-			{
-				newpos = StrToInt(position);
-				if (newpos > 0 && newpos < 100)
-					Mpd->Seek(s->GetTotalLength()*newpos/100.0);
-			}
-			else
+			else if (position.find('s') != string::npos) // probably position in seconds
 			{
 				newpos = StrToInt(position);
 				if (newpos > 0 && newpos < s->GetTotalLength())
 					Mpd->Seek(newpos);
 			}
+			else
+			{
+				newpos = StrToInt(position);
+				if (newpos > 0 && newpos < 100)
+					Mpd->Seek(s->GetTotalLength()*newpos/100.0);
+			}
 		}
 		else if (Keypressed(input, Key.ReverseSelection))
 		{