diff --git a/main.ts b/main.ts
index 3a63076..9463320 100644
--- a/main.ts
+++ b/main.ts
@@ -7,9 +7,13 @@ import { t } from './src/translations';
 
 export default class MediaViewPlugin extends Plugin {
     settings: MediaViewSettings;
+
     async onload() {
         await this.loadSettings();
         
+        // 添加設定頁面
+        this.addSettingTab(new MediaViewSettingTab(this.app, this));
+
         // 添加命令
         this.addCommand({
             id: 'open-media-viewer',
@@ -20,12 +24,6 @@ export default class MediaViewPlugin extends Plugin {
             }
         });
 
-        // 添加 ribbon 命令
-        this.addRibbonIcon('images', t('open_media_viewer'), () => {
-            const modal = new FullScreenModal(this.app, this, 'command');
-            modal.open();
-        });
-
         this.addCommand({
             id: 'generategallery',
             name: t('generate_gallery'),
@@ -42,62 +40,67 @@ export default class MediaViewPlugin extends Plugin {
             }
         });
 
-        this.registerEvent(this.app.workspace.on('editor-menu', (menu, editor, view) => {
-            menu.addItem((subItem) => {
-                subItem
-                    .setTitle(t('generate_gallery'))
-                    .setIcon('image')
-                    .onClick(() => this.generateGallery())
+        this.app.workspace.onLayoutReady(() => {
+            // 添加 ribbon 命令
+            this.addRibbonIcon('images', t('open_media_viewer'), () => {
+                const modal = new FullScreenModal(this.app, this, 'command');
+                modal.open();
             });
-        }));
 
-        if (this.settings.openMediaBrowserOnClick) {
-            // 添加點擊圖片的事件監聽
-            this.registerDomEvent(document, 'click', (evt) => {
-                const target = (evt.target) as HTMLImageElement;
-                if (!target) return;
+            this.registerEvent(this.app.workspace.on('editor-menu', (menu, editor, view) => {
+                menu.addItem((subItem) => {
+                    subItem
+                        .setTitle(t('generate_gallery'))
+                        .setIcon('image')
+                        .onClick(() => this.generateGallery())
+                });
+            }));
 
-                if (!target.closest('.markdown-reading-view') &&
-                !target.closest('.cm-s-obsidian') ) {
-                    return;
-                }
+            if (this.settings.openMediaBrowserOnClick) {
+                // 添加點擊圖片的事件監聽
+                this.registerDomEvent(document, 'click', (evt) => {
+                    const target = (evt.target) as HTMLImageElement;
+                    if (!target) return;
 
-                // 確認點擊的是圖片，且不在 code block 內，也不在 modal 內
-                if (target.tagName === 'IMG' && 
-                    !target.closest('pre') && 
-                    !target.closest('.mv-media-viewer-modal') &&
-                    !target.closest('.mvgb-media-gallery-grid')) {
-                    // 阻止預設行為
-                    evt.preventDefault();
-                    evt.stopPropagation();
+                    if (!target.closest('.markdown-reading-view') &&
+                    !target.closest('.cm-s-obsidian') ) {
+                        return;
+                    }
 
-                    // 開啟 modal
-                    const modal = new FullScreenModal(this.app, this, 'thumbnail');
-                    modal.open();
-                    
-                    // 等待 modal 載入完成後顯示對應圖片
-                    setTimeout(() => {
-                        const allUrls = modal.mediaUrls;
-                        const targetUrl = target.src;
-                        const targetIndex = allUrls.findIndex(m => m.url === targetUrl);
-                        if (targetIndex !== -1) {
-                            modal.showMedia(targetIndex);
-                        }
-                    }, 100);
-                }
-            }, true);
-        }
+                    // 確認點擊的是圖片，且不在 code block 內，也不在 modal 內
+                    if (target.tagName === 'IMG' && 
+                        !target.closest('pre') && 
+                        !target.closest('.mv-media-viewer-modal') &&
+                        !target.closest('.mvgb-media-gallery-grid')) {
+                        // 阻止預設行為
+                        evt.preventDefault();
+                        evt.stopPropagation();
 
-        // 初始化 GalleryBlockProcessor
-        const galleryProcessor = new GalleryBlock(this.app, this);
+                        // 開啟 modal
+                        const modal = new FullScreenModal(this.app, this, 'thumbnail');
+                        modal.open();
+                        
+                        // 等待 modal 載入完成後顯示對應圖片
+                        setTimeout(() => {
+                            const allUrls = modal.mediaUrls;
+                            const targetUrl = target.src;
+                            const targetIndex = allUrls.findIndex(m => m.url === targetUrl);
+                            if (targetIndex !== -1) {
+                                modal.showMedia(targetIndex);
+                            }
+                        }, 100);
+                    }
+                }, true);
+            }
 
-        // 統一使用 registerMarkdownCodeBlockProcessor 來處理兩種模式
-        this.registerMarkdownCodeBlockProcessor("gallery", (source, el, ctx) => 
-            galleryProcessor.processGalleryBlock(source, el)
-        );
+            // 初始化 GalleryBlockProcessor
+            const galleryProcessor = new GalleryBlock(this.app, this);
 
-        // 添加設定頁面
-        this.addSettingTab(new MediaViewSettingTab(this.app, this));
+            // 統一使用 registerMarkdownCodeBlockProcessor 來處理兩種模式
+            this.registerMarkdownCodeBlockProcessor("gallery", (source, el, ctx) => 
+                galleryProcessor.processGalleryBlock(source, el)
+            );
+        });
     }
 
     generateGallery() {
diff --git a/manifest.json b/manifest.json
index 8da38b6..26c521e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "mediaviewer",
 	"name": "Media Viewer",
-	"version": "1.9.7",
+	"version": "1.9.8",
 	"minAppVersion": "1.1.0",
 	"description": "View and manage media files within your notes.",
 	"author": "Devon22",
diff --git a/package-lock.json b/package-lock.json
index b3af981..227d4c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "mediaviewer",
-	"version": "1.9.7",
+	"version": "1.9.8",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "mediaviewer",
-			"version": "1.9.7",
+			"version": "1.9.8",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^16.11.6",
diff --git a/package.json b/package.json
index a7a8ea0..af865a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mediaviewer",
-	"version": "1.9.7",
+	"version": "1.9.8",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/src/fullscreen.ts b/src/fullscreen.ts
index 06da8e5..1d96827 100644
--- a/src/fullscreen.ts
+++ b/src/fullscreen.ts
@@ -130,7 +130,7 @@ export class FullScreenModal extends Modal {
                                 urlLower.includes('format=gif') || 
                                 urlLower.includes('format=webp') ||
                                 // 檢查 URL 路徑中是否包含圖片擴展名
-                                urlLower.match(/\.(jpg|jpeg|png|gif|webp)(\?|&|#|$)/)) {
+                                urlLower.match(/\.(jpg|jpeg|png|gif|webp)(\?|&|#|!|$)/)) {
                                 type = 'image';
                             } else {
                                 continue;
diff --git a/versions.json b/versions.json
index bb5f7cf..f9045bd 100644
--- a/versions.json
+++ b/versions.json
@@ -1,3 +1,3 @@
 {
-	"1.9.7": "1.1.0"
+	"1.9.8": "1.1.0"
 }
\ No newline at end of file