diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog
index 2263ecf8..3a336d28 100644
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -60,6 +60,8 @@ Changes since wmaker 0.80.1:
 - Fixed a memleak in the file panel.
 - Double/triple-click selection in text widgets (Vitaly Ovtchinnikov
   <ov@rbcmail.ru>)
+- fixed bug in tableview (clicked row callback got incorrect row) (Carlos Torres 
+  <vlaadbrain@operamail.com>)
 
 Changes since wmaker 0.80.0:
 ............................
diff --git a/WINGs/Extras/wtableview.c b/WINGs/Extras/wtableview.c
index e7df3e70..97126f7e 100644
--- a/WINGs/Extras/wtableview.c
+++ b/WINGs/Extras/wtableview.c
@@ -1158,12 +1158,11 @@ void WMReloadTableView(WMTableView *table)
     WMEmptyArray(table->selectedRows);
     
     if (table->clickedRow >= 0) {
-	table->clickedRow = -1;
-
 	if (table->action)
 	    (*table->action)(table, table->clientData);
 	WMPostNotificationName(WMTableViewSelectionDidChangeNotification,
 			       table, NULL);
+	table->clickedRow = -1;
     }
 
     if (table->delegate && table->delegate->numberOfRows) {