diff --git a/ChangeLog b/ChangeLog
index 5dec0549b..3e55a0ad4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1982489 [relation] Relationship view should check for changes 
 - bug [history] Do not save too big queries in history 
 - [security] Do not show version info on login screen 
+- bug #2018595 [import] Potential data loss on import resubmit 
 
 2.11.7.1 (2008-07-15)
 - bug [security] XSRF/CSRF by manipulating the db,
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 9f1b0eec7..f62bf6457 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -154,10 +154,23 @@ echo "\n";
         <label for="checkbox_allow_interrupt"><?php echo $strAllowInterrupt; ?></label><br />
         </div>
 
+        <?php
+        if (! (isset($timeout_passed) && $timeout_passed)) {
+        ?>
         <div class="formelementrow">
         <label for="text_skip_queries"><?php echo $strSkipQueries; ?></label>
         <input type="text" name="skip_queries" value="<?php echo PMA_pluginGetDefault('Import', 'skip_queries');?>" id="text_skip_queries" />
         </div>
+        <?php
+        } else {
+        // If timeout has passed,
+        // do not show the Skip dialog to avoid the risk of someone
+        // entering a value here that would interfere with "skip"
+        ?>
+        <input type="hidden" name="skip_queries" value="<?php echo PMA_pluginGetDefault('Import', 'skip_queries');?>" id="text_skip_queries" />
+        <?php
+        }
+        ?>
     </fieldset>
 
     <fieldset class="options">