diff --git a/change_log.txt b/change_log.txt
index a6f6f10f7e..4f72bb28c9 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -4,6 +4,14 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Nov-11 UPDATE   Dick Hollenbeck <dick@softplc.com>
+================================================================================
++ pcbnew
+    Fixed modedit.cpp bug which occurred when selecting a non pad item (such
+    as a text field) in the module editor, then selecting Dimensions -> Pad Settings
+    in the module editor.
+
+    
 2007-Nov-11 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
 ================================================================================
 + eeschema & pcbnew & gerbview
@@ -28,8 +36,8 @@ email address.
 2007-Nov-10 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 +eeschema:
-	More comprehensive dialog in netlist plugin interface.
-	Eeschema configuration now shows the plugin netlist list
+    More comprehensive dialog in netlist plugin interface.
+    Eeschema configuration now shows the plugin netlist list
 
 
 2007-Nov-09 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
@@ -48,7 +56,7 @@ email address.
 2007-Nov-02 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 + all
-	removed not used files
+    removed not used files
 
 
 2007-Nov-07 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
@@ -1275,7 +1283,6 @@ email address.
     bug fix:
         crash libedit when loading certain components (linux only)
         incomplete generation of erc file list
-    
 
 
 2007-June-13 UPDATE   Richard A Burton <richardaburton@gmail.com>
diff --git a/common/selcolor.cpp b/common/selcolor.cpp
index 54f1e0788f..6c083d061a 100644
--- a/common/selcolor.cpp
+++ b/common/selcolor.cpp
@@ -1,3 +1,4 @@
+
 /****************/
 /* SELCOLOR.CPP */
 /****************/
diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp
index 6b205731be..0fd31480e8 100644
--- a/pcbnew/modedit.cpp
+++ b/pcbnew/modedit.cpp
@@ -49,19 +49,19 @@ BOARD_ITEM* WinEDA_ModuleEditFrame::ModeditLocateAndDisplay( int aHotKeyCode )
     m_Collector->Collect( m_Pcb, scanList, GetScreen()->RefPos( true ), guide );
 
     /* Remove redundancies: when an item is found, we can remove the
-	 * module from list
+     * module from list
      */
-	if( m_Collector->GetCount() > 1 )
-	{
-		for( int ii = 0;  ii < m_Collector->GetCount(); ii++ )
-		{
-			item = (*m_Collector)[ii];
-			if( item->Type() != TYPEMODULE )
-				continue;
-			m_Collector->Remove( ii );
-			ii--;
-		}
-	}
+    if( m_Collector->GetCount() > 1 )
+    {
+        for( int ii = 0;  ii < m_Collector->GetCount(); ii++ )
+        {
+            item = (*m_Collector)[ii];
+            if( item->Type() != TYPEMODULE )
+                continue;
+            m_Collector->Remove( ii );
+            ii--;
+        }
+    }
 
     if( m_Collector->GetCount() <= 1 )
     {
@@ -573,8 +573,13 @@ void WinEDA_ModuleEditFrame::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_PCB_PAD_SETUP:
-        InstallPadOptionsFrame( (D_PAD*) GetScreen()->GetCurItem(),
-                               &dc, pos );
+        {
+            BOARD_ITEM* item = GetCurItem();
+            if( item && item->Type()==TYPEPAD )
+                InstallPadOptionsFrame( (D_PAD*) item, &dc, pos );
+            else
+                InstallPadOptionsFrame( NULL, &dc, pos );
+        }
         break;
 
     case ID_PCB_USER_GRID_SETUP: