diff --git a/ChangeLog b/ChangeLog
index e78faf5bc..58bcae30d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-09  Gary Burton <gary.burton@zen.co.uk>
+	* src/DisplayModels/_NoteModel.py:
+	* src/Selectors/_SelectNote.py:
+	* src/DisplayViews/NoteView.py:
+	* src/gen/db/base.py:
+	Change the order of columns on Note View and Select Note dialog. Also
+	fixed a crash. Bug #1529
+
 2008-01-09  Gary Burton <gary.burton@zen.co.uk>
 	* src/DisplayModels/_BaseModel.py: add self.db to match function
 
diff --git a/src/DataViews/NoteView.py b/src/DataViews/NoteView.py
index 47f3c723b..1eb2b1a66 100644
--- a/src/DataViews/NoteView.py
+++ b/src/DataViews/NoteView.py
@@ -67,10 +67,10 @@ from gettext import gettext as _
 class NoteView(PageView.ListView):
     
     COLUMN_NAMES = [
+        _('Preview'),
         _('ID'),
         _('Type'),
         _('Marker'),
-        _('Preview'),
         ]
 
     ADD_MSG     = _("Add a new note")
diff --git a/src/DisplayModels/_NoteModel.py b/src/DisplayModels/_NoteModel.py
index 51e266833..f70b0b5d2 100644
--- a/src/DisplayModels/_NoteModel.py
+++ b/src/DisplayModels/_NoteModel.py
@@ -54,7 +54,7 @@ import gen.lib
 #-------------------------------------------------------------------------
 class NoteModel(BaseModel):
 
-    HANDLE_COL = 2
+    HANDLE_COL = 4
     _MARKER_COL = 6
 
     def __init__(self,db,scol=0,order=gtk.SORT_ASCENDING,search=None,
@@ -62,20 +62,20 @@ class NoteModel(BaseModel):
         self.gen_cursor = db.get_note_cursor
         self.map = db.get_raw_note_data
         self.fmap = [
+            self.column_preview,
             self.column_id,
             self.column_type,
             self.column_marker,
-            self.column_preview,
             self.column_handle,
-            self.column_marker_color,
+            self.column_marker_color
             ]
         self.smap = [
+            self.column_preview,
             self.column_id,
             self.column_type,
             self.column_marker,
-            self.column_preview,
             self.column_handle,
-            self.column_marker_color,
+            self.column_marker_color
             ]
         self.marker_color_column = 5
         BaseModel.__init__(self, db, scol, order,
diff --git a/src/Selectors/_SelectNote.py b/src/Selectors/_SelectNote.py
index 94d7e17c9..e83c39263 100644
--- a/src/Selectors/_SelectNote.py
+++ b/src/Selectors/_SelectNote.py
@@ -58,10 +58,10 @@ class SelectNote(BaseSelector):
 
     def get_column_titles(self):
         return [
+            (_('Preview'), 350, BaseSelector.TEXT),
             (_('ID'),     75, BaseSelector.TEXT),
-            (_('Type'), 0, BaseSelector.NONE),
-            (_('Marker'), 0, BaseSelector.NONE),
-            (_('Preview'), 350, BaseSelector.TEXT)
+            (_('Type'), 100, BaseSelector.TEXT),
+            (_('Marker'), 100, BaseSelector.TEXT)
             ]
             
     def get_from_handle_func(self):
@@ -82,4 +82,3 @@ class SelectNote(BaseSelector):
         """
         import DataViews
         return DataViews.NoteView.COLUMN_NAMES
-    
\ No newline at end of file
diff --git a/src/gen/db/base.py b/src/gen/db/base.py
index adaa23a8c..f955d40c3 100644
--- a/src/gen/db/base.py
+++ b/src/gen/db/base.py
@@ -2289,7 +2289,7 @@ class GrampsDbBase(GrampsDBCallback):
         Returns the Note display common information stored in the
         database's metadata.
         """
-        default = [(1, 0, 100), (1, 1, 100), (0, 2, 100), (1, 3, 100)]
+        default = [(1, 0, 350), (1, 1, 75), (1, 2, 100), (1, 3, 100)]
         return self.__get_columns(NOTE_COL_KEY, default)
 
     def delete_primary_from_reference_map(self, handle, transaction):