diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 15e10536f..dd70a47a5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -76,6 +76,7 @@
  - fixed: Asset manager now sets "proceed" so we go back to asset manager after editing an asset
  - rfe: Registration form to keep user entries on error - required and errored fields are now highlighted.
  - added: Thingy view template now has access to field_dateCreated and field_lastUpdated for Things.
+ - added: AssetManager now times out after 30 seconds on the AJAX call to load assets. This will help people realize they are having network issues. 
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index d0b562b84..c1498c0af 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -308,6 +308,7 @@ sub www_ajaxGetManagerPage {
     $assetInfo->{ dir           } = lc $session->form->get( 'orderByDirection' );
     
     $session->http->setMimeType( 'application/json' );
+
     return encode_json( $assetInfo );
 }
 
@@ -544,7 +545,7 @@ ENDHTML
     $output         .= <<"ENDJS";
     // Start the data source
     WebGUI.AssetManager.DataSource
-        = new YAHOO.util.DataSource( '?op=assetManager;method=ajaxGetManagerPage' );
+        = new YAHOO.util.DataSource( '?op=assetManager;method=ajaxGetManagerPage',{connTimeout:30000} );
     WebGUI.AssetManager.DataSource.responseType
         = YAHOO.util.DataSource.TYPE_JSON;
     WebGUI.AssetManager.DataSource.responseSchema