diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php
index a281895..1fce627 100755
--- a/search2/indexing/indexerCore.inc.php
+++ b/search2/indexing/indexerCore.inc.php
@@ -407,6 +407,10 @@ class DocumentShortcutResultItem extends ProxyResultItem
 
 class FolderShortcutResultItem extends ProxyResultItem
 {
+    var $parentId;
+    var $linkedId;
+    var $full_path;
+    
     public function getFolderID() { return $this->getId(); }
     public function getMimeIconPath() { return 'folder_shortcut'; }
 
diff --git a/search2/search/search.inc.php b/search2/search/search.inc.php
index e4d6cec..6f93de2 100755
--- a/search2/search/search.inc.php
+++ b/search2/search/search.inc.php
@@ -764,7 +764,7 @@ function resolveSearchShortcuts($result)
     if (!empty($folderIds))
     {
 
-        $sql = "SELECT f.id, f.linked_folder_id from folders f ";
+        $sql = "SELECT f.id, f.parent_id, f.linked_folder_id, f.full_path from folders f ";
         $sql .= 'INNER JOIN permission_lookups AS PL ON f.permission_lookup_id = PL.id '. "\n";
         $sql .= 'INNER JOIN permission_lookup_assignments AS PLA ON PL.id = PLA.permission_lookup_id AND PLA.permission_id = '.$permId. " \n";
         $sql .= " WHERE f.linked_folder_id in ($folderIds) AND PLA.permission_descriptor_id IN ($sPermissionDescriptors)";
@@ -775,8 +775,13 @@ function resolveSearchShortcuts($result)
         {
             $id = $row['id'];
             $linked_id = $row['linked_folder_id'];
+            
+            $shortFolder = new FolderShortcutResultItem($id, $result['folders'][$linked_id]);
+            $shortFolder->parentId = $row['parent_id'];
+            $shortFolder->linkedId = $row['linked_folder_id'];
+            $shortFolder->full_path = $row['full_path'];
 
-            $result['shortfolders'][$id] = new FolderShortcutResultItem($id, $result['folders'][$linked_id]);
+            $result['shortfolders'][$id] = $shortFolder;
         }
     }
     return $result;
diff --git a/templates/ktcore/search2/search_results.smarty b/templates/ktcore/search2/search_results.smarty
index a6d4fe7..6df02dd 100755
--- a/templates/ktcore/search2/search_results.smarty
+++ b/templates/ktcore/search2/search_results.smarty
@@ -156,25 +156,24 @@ function onShowAll(showall)
 	    <span class="contenttype {$hit->MimeIconPath}">
 
 		{if $hit->IsDocument}
-		&nbsp;&nbsp;<a href="{$rootUrl}/view.php?fDocumentId={$hit->Id}"><B>{$hit->Title|mb_truncate:30:'...':true}</b></a>
-		{if $hit->Title != $hit->Filename}
-			&nbsp;&nbsp;
-			<font style=" color: green "> - {i18n}Filename:{/i18n} {$hit->Filename|mb_truncate:30:'...':true}</font>
-		{/if}
-		{if $hit->IsAvailable}
-		    &nbsp;&nbsp;
-            <img src="{$rootUrl}/resources/graphics/download.png" title="Download Document" onclick="document.location='{$rootUrl}/action.php?kt_path_info=ktcore.actions.document.view&fDocumentId={$hit->Id}';"></a>
-
-		{/if}
+			&nbsp;&nbsp;<a href="{$rootUrl}/view.php?fDocumentId={$hit->Id}"><B>{$hit->Title|mb_truncate:30:'...':true}</b></a>
+			{if $hit->Title != $hit->Filename}
+				&nbsp;&nbsp;
+				<font style=" color: green "> - {i18n}Filename:{/i18n} {$hit->Filename|mb_truncate:30:'...':true}</font>
+			{/if}
+			{if $hit->IsAvailable}
+		    	&nbsp;&nbsp;
+            	<img src="{$rootUrl}/resources/graphics/download.png" title="Download Document" onclick="document.location='{$rootUrl}/action.php?kt_path_info=ktcore.actions.document.view&fDocumentId={$hit->Id}';"></a>
+			{/if}
 
 
-		{if !$hit->IsAvailable}
-			&nbsp;&nbsp;
-			<font style=" color: red "><B> * {i18n}NOT AVAILABLE{/i18n} * </B></font>
-		{/if}
+			{if !$hit->IsAvailable}
+				&nbsp;&nbsp;
+				<font style=" color: red "><B> * {i18n}NOT AVAILABLE{/i18n} * </B></font>
+			{/if}
 
 		{else}
-		&nbsp;&nbsp;<a href="{$rootUrl}/browse.php?fFolderId={$hit->RealId}{if $hit->IsProxy}&fShortcutFolder={$hit->Id}{/if}"><B>{$hit->Title|mb_truncate:30:'...':true}</b></a>
+			&nbsp;&nbsp;<a href="{$rootUrl}/browse.php?fFolderId={$hit->RealId}{if $hit->IsProxy}&fShortcutFolder={$hit->parentId}{/if}"><B>{$hit->Title|mb_truncate:30:'...':true}</b></a>
 
         {/if}
 
@@ -193,7 +192,7 @@ function onShowAll(showall)
 		{if $hit->IsDocument}
 		      <font style=" color: green "><a href="{$rootUrl}/browse.php?fFolderId={$hit->FolderId}" tag="{$hit->FullPath}">{$hit->FullPath|mb_truncate:30:'...':true}</a>/{$hit->Title|mb_truncate:30:'...':true} - {$hit->Filesize}</font>
 		{else}
-		      <font style=" color: green "><a href="{$rootUrl}/browse.php?fFolderId={$hit->FolderId}" tag="{$hit->FullPath}">{$hit->FullPath|mb_truncate:30:'...':true}</a></font>
+		      <font style=" color: green "><a href="{$rootUrl}/browse.php?{if $hit->IsProxy}fFolderId={$hit->linkedId}&fShortcutFolder={$hit->parentId}{else}fFolderId={$hit->FolderId}{/if}" tag="{if $hit->IsProxy}{$hit-full_path}{else}{$hit->FullPath}{/if}">{if $hit->IsProxy}/{$hit->full_path|mb_truncate:30:'...':true}{else}{$hit->FullPath|mb_truncate:30:'...':true}{/if}{}</a></font>
 		{/if}
 		</td>
 			<td align=right><nobr>