diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index 5404e693..0f8ff630 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -508,8 +508,8 @@ void FbRun::tabCompleteApps() {
             first_run = false;
             std::string path = getenv("PATH");
             FbTk::Directory dir;
-            for (unsigned int l = 0, r = 0; r < path.size(); ++r) {
-                if ((path.at(r) == ':' || r == path.size() - 1) && r - l > 1) {
+            for (unsigned int l = 0, r = 0; r <= path.size(); ++r) {
+                if ((r == path.size() || path.at(r) == ':') && r - l > 1) {
                     dir.open(path.substr(l, r - l).c_str());
                     prefix = dir.name() + (*dir.name().rbegin() == '/' ? "" : "/");
                     int n = dir.entries();