diff --git a/admin/reports.php b/admin/reports.php
index 44d88acf..bbd38089 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -180,6 +180,7 @@ function add_report()
 
 function gen_report() {
 	report_gen($('#report').val());
+	return false;
 }
 
 var edit=false;
@@ -312,7 +313,12 @@ $(document).ready(function() {
 <?
  /* Load available reports */
  $reports = report_load_all();
+ foreach($report_custom as $id=>$r) {
+ 	$r['id'] = -$id;
+ 	$reports[-$id] = $r;
+ }
 ?>
+
 <hr />
 <h4><?=i18n("All Reports")?></h3>
 
diff --git a/admin/reports_gen.php b/admin/reports_gen.php
index 20d849ca..48857cb7 100644
--- a/admin/reports_gen.php
+++ b/admin/reports_gen.php
@@ -56,6 +56,15 @@ if(is_array($_GET['filter'])) {
 
 switch($_GET['action']) {
 case 'dialog_gen':
+	if($id < 0) {
+		$u = "{$config['SFIABDIRECTORY']}/{$report_custom[-$id]['custom_url']}";
+		?>
+		<script type="text/javascript">
+			window.location.href="<?=$u?>";
+		</script>
+		<?
+		exit;
+	}
 	?>
 	<div id="report_dialog_gen" title="Generate Report" style="display: none">
 	<div id="report_gen_tabs">