diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java
index 93461c149..81d219139 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java
+++ b/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java
@@ -76,6 +76,12 @@ public class SearchAction
      */
     private ConfigurationStore configurationStore;
 
+    private static final String NO_RESULTS = "noResults";
+
+    private static final String RESULTS = "results";
+
+    private static final String ARTIFACT = "artifact";
+
     public String quickSearch()
         throws MalformedURLException, RepositoryIndexException, RepositoryIndexSearchException,
         ConfigurationStoreException, ParseException
@@ -104,7 +110,7 @@ public class SearchAction
     }
 
     public String findArtifact()
-        throws ConfigurationStoreException, RepositoryIndexException, RepositoryIndexSearchException
+        throws Exception
     {
         // TODO: give action message if indexing is in progress
 
@@ -121,7 +127,18 @@ public class SearchAction
         searchResults = index.search(
             new LuceneQuery( new TermQuery( new Term( StandardIndexRecordFields.MD5, md5.toLowerCase() ) ) ) );
 
-        return SUCCESS;
+        if ( searchResults.isEmpty() )
+        {
+            return NO_RESULTS;
+        }
+        if ( searchResults.size() == 1 )
+        {
+            return ARTIFACT;
+        }
+        else
+        {
+            return RESULTS;
+        }
     }
 
     private RepositoryArtifactIndex getIndex()
@@ -164,5 +181,4 @@ public class SearchAction
     {
         return searchResults;
     }
-
 }
diff --git a/maven-repository-webapp/src/main/resources/xwork.xml b/maven-repository-webapp/src/main/resources/xwork.xml
index b13de36b5..f28f30b59 100644
--- a/maven-repository-webapp/src/main/resources/xwork.xml
+++ b/maven-repository-webapp/src/main/resources/xwork.xml
@@ -50,6 +50,8 @@
       <result name="input">/WEB-INF/jsp/quickSearch.jsp</result>
       <result>/WEB-INF/jsp/results.jsp</result>
       <result name="error">/WEB-INF/jsp/quickSearch.jsp</result>
+      <result name="noResults">/WEB-INF/jsp/noResults.jsp</result>
+      <!-- TODO! -->
     </action>
 
     <action name="findArtifact" class="searchAction" method="input">
@@ -58,8 +60,14 @@
 
     <action name="checksumSearch" class="searchAction" method="findArtifact">
       <result name="input">/WEB-INF/jsp/findArtifact.jsp</result>
-      <result>/WEB-INF/jsp/results.jsp</result>
+      <result name="results">/WEB-INF/jsp/results.jsp</result>
       <result name="error">/WEB-INF/jsp/findArtifact.jsp</result>
+      <result name="noResults">/WEB-INF/jsp/noResults.jsp</result>
+      <!-- TODO! -->
+      <!-- TODO! use redirect-action instead -->
+      <result name="artifact" type="redirect">
+        /browse/${searchResults[0].groupId}/${searchResults[0].artifactId}/${searchResults[0].version}
+      </result>
     </action>
 
     <action name="browse" class="browseAction" method="browse">