diff --git a/src/libraries/controllers/PhotoController.php b/src/libraries/controllers/PhotoController.php
index 7461c0452..35d21cd4c 100644
--- a/src/libraries/controllers/PhotoController.php
+++ b/src/libraries/controllers/PhotoController.php
@@ -143,7 +143,9 @@ public function list_($filterOpts = null)
     if(!empty($_SERVER['QUERY_STRING']))
       parse_str($_SERVER['QUERY_STRING'], $getParams);
     $params = array('_GET' => array_merge($getParams, array('returnSizes' => $returnSizes)));
-    if($filterOpts)
+    if(isset($params['_GET']['q']))
+      $photos = $this->api->invoke("/photos/search.json", EpiRoute::httpGet, $params);
+    elseif($filterOpts)
       $photos = $this->api->invoke("/photos/{$filterOpts}/list.json", EpiRoute::httpGet, $params);
     else
       $photos = $this->api->invoke("/photos/list.json", EpiRoute::httpGet, $params);