configure.ac.in      |  2 +-
 src/process-window.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index c36d8a5..30d7bbd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -16,7 +16,7 @@ m4_define([taskmanager_version_major], [1])
 m4_define([taskmanager_version_minor], [5])
 m4_define([taskmanager_version_micro], [5])
 m4_define([taskmanager_version_build], [@REVISION@])
-m4_define([taskmanager_version_tag], [])
+m4_define([taskmanager_version_tag], [git])
 m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])])
 
 dnl ***************************
diff --git a/src/process-window.c b/src/process-window.c
index e937a8e..bd16c40 100644
--- a/src/process-window.c
+++ b/src/process-window.c
@@ -268,13 +268,13 @@ xtm_process_window_unstick_view_cursor (GtkTreeView *tree_view, XtmProcessWindow
 	if (! window->view_stuck)
 		return;
 
-	gtk_tree_view_get_cursor (tree_view, &cursor, NULL);
-	gtk_tree_view_get_visible_range (tree_view, NULL, &end);
-	if (gtk_tree_path_compare (cursor, end) >= 0)
-		window->view_stuck = FALSE;
-
-	gtk_tree_path_free (cursor);
-	gtk_tree_path_free (end);
+	if (gtk_tree_view_get_visible_range (tree_view, NULL, &end)) {
+		gtk_tree_view_get_cursor (tree_view, &cursor, NULL);
+		if (cursor != NULL && gtk_tree_path_compare (cursor, end) >= 0)
+			window->view_stuck = FALSE;
+		gtk_tree_path_free (cursor);
+		gtk_tree_path_free (end);
+	}
 }
 
 static void